Doomsday Engine

Revision: 5643
          http://deng.svn.sourceforge.net/deng/?rev=5643&view=rev
Author:   danij
Date:     2008-04-08 07:54:21 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
Revised the formatting of the "give" ccmd "stuff" parameter. Now works as follows:
* give wak - As before, will give all weapons all ammos and all keys
* give w1k2 - Will give weapon 1 and key 2.

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/src/m_cheat.c
    trunk/doomsday/plugins/jdoom64/src/m_cheat.c
    trunk/doomsday/plugins/jhexen/src/m_cheat.c
    trunk/doomsday/plugins/wolftc/src/m_cheat.c

Modified: trunk/doomsday/plugins/jdoom/src/m_cheat.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/m_cheat.c	2008-04-08 01:10:00 UTC (rev 5642)
+++ trunk/doomsday/plugins/jdoom/src/m_cheat.c	2008-04-08 14:54:21 UTC (rev 5643)
@@ -662,8 +662,8 @@
 DEFCC(CCmdCheatGive)
 {
     char                buf[100];
-    int                 i, weapNum;
-    player_t           *plyr = &players[CONSOLEPLAYER];
+    player_t*           plyr = &players[CONSOLEPLAYER];
+    size_t              i, stuffLen;
 
     if(IS_CLIENT)
     {
@@ -682,7 +682,8 @@
     {
         Con_Printf("Usage:\n  give (stuff)\n");
         Con_Printf("  give (stuff) (player)\n");
-        Con_Printf("Stuff consists of one or more of:\n");
+        Con_Printf("Stuff consists of one or more of (type:id). "
+                   "If no id; give all of type:\n");
         Con_Printf(" a - ammo\n");
         Con_Printf(" b - berserk\n");
         Con_Printf(" f - the power of flight\n");
@@ -695,8 +696,8 @@
         Con_Printf(" s - radiation shielding suit\n");
         Con_Printf(" v - invisibility\n");
         Con_Printf(" w - weapons\n");
-        Con_Printf(" 0-8 - weapon\n");
         Con_Printf("Example: 'give arw' corresponds the cheat IDFA.\n");
+        Con_Printf("Example: 'give w2k1' gives weapon two and key one.\n");
         return true;
     }
 
@@ -720,15 +721,36 @@
 
     strcpy(buf, argv[1]); // Stuff is the 2nd arg.
     strlwr(buf);
+    stuffLen = strlen(buf);
     for(i = 0; buf[i]; ++i)
     {
         switch(buf[i])
         {
         case 'a':
-            Con_Printf("Ammo given.\n");
-            Cht_GiveFunc(plyr, 0, true, 0, 0, NULL);
+            {
+            boolean             giveAll = true;
+
+            if(i < stuffLen)
+            {
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_AMMO_TYPES)
+                {   // Give one specific ammo type.
+                    plyr->update |= PSF_AMMO;
+                    plyr->ammo[idx] = plyr->maxAmmo[idx];
+                    giveAll = false;
+                    i++;
+                }
+            }
+
+            if(giveAll)
+            {
+                Con_Printf("All ammo given.\n");
+                Cht_GiveFunc(plyr, 0, true, 0, 0, NULL);
+            }
             break;
-
+            }
         case 'b':
             if(Cht_PowerUpFunc(plyr, PT_STRENGTH))
                 Con_Printf("Your vision blurs! Yaarrrgh!!\n");
@@ -750,10 +772,30 @@
             break;
 
         case 'k':
-            Con_Printf("Key cards and skulls given.\n");
-            Cht_GiveFunc(plyr, 0, 0, 0, true, NULL);
+            {
+            boolean             giveAll = true;
+
+            if(i < stuffLen)
+            {
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_KEY_TYPES)
+                {   // Give one specific key.
+                    plyr->update |= PSF_KEYS;
+                    plyr->keys[idx] = true;
+                    giveAll = false;
+                    i++;
+                }
+            }
+
+            if(giveAll)
+            {
+                Con_Printf("Key cards and skulls given.\n");
+                Cht_GiveFunc(plyr, 0, 0, 0, true, NULL);
+            }
             break;
-
+            }
         case 'm':
             Con_Printf("Computer area map given.\n");
             Cht_PowerUpFunc(plyr, PT_ALLMAP);
@@ -780,19 +822,33 @@
             break;
 
         case 'w':
-            Con_Printf("Weapons given.\n");
-            Cht_GiveFunc(plyr, true, 0, 0, 0, NULL);
-            break;
+            {
+            boolean             giveAll = true;
 
-        default:
-            // Individual Weapon
-            weapNum = ((int) buf[i]) - 48;
-            if(weapNum >= 0 && weapNum < NUM_WEAPON_TYPES)
+            if(i < stuffLen)
             {
-               P_GiveWeapon(plyr, weapNum, false);
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_WEAPON_TYPES)
+                {   // Give one specific weapon.
+                    P_GiveWeapon(plyr, idx, false);
+                    giveAll = false;
+                    i++;
+                }
             }
-            else // Unrecognized
-                Con_Printf("What do you mean, '%c'?\n", buf[i]);
+
+            if(giveAll)
+            {
+                Con_Printf("All weapons given.\n");
+                Cht_GiveFunc(plyr, true, 0, 0, 0, NULL);
+            }
+            break;
+            }
+        default:
+            // Unrecognized
+            Con_Printf("What do you mean, '%c'?\n", buf[i]);
+            break;
         }
     }
 

Modified: trunk/doomsday/plugins/jdoom64/src/m_cheat.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/m_cheat.c	2008-04-08 01:10:00 UTC (rev 5642)
+++ trunk/doomsday/plugins/jdoom64/src/m_cheat.c	2008-04-08 14:54:21 UTC (rev 5643)
@@ -680,8 +680,8 @@
 DEFCC(CCmdCheatGive)
 {
     char                buf[100];
-    int                 i, weapNum;
     player_t           *plyr = &players[CONSOLEPLAYER];
+    size_t              i, stuffLen;
 
     if(IS_CLIENT)
     {
@@ -699,7 +699,8 @@
     {
         Con_Printf("Usage:\n  give (stuff)\n");
         Con_Printf("  give (stuff) (player)\n");
-        Con_Printf("Stuff consists of one or more of:\n");
+        Con_Printf("Stuff consists of one or more of (type:id). "
+                   "If no id; give all of type:\n");
         Con_Printf(" a - ammo\n");
         Con_Printf(" b - berserk\n");
         Con_Printf(" f - the power of flight\n");
@@ -712,8 +713,8 @@
         Con_Printf(" s - radiation shielding suit\n");
         Con_Printf(" v - invisibility\n");
         Con_Printf(" w - weapons\n");
-        Con_Printf(" 0-9 - weapon\n");
         Con_Printf("Example: 'give arw' corresponds the cheat IDFA.\n");
+        Con_Printf("Example: 'give w2k1' gives weapon two and key one.\n");
         return true;
     }
 
@@ -737,15 +738,36 @@
 
     strcpy(buf, argv[1]); // Stuff is the 2nd arg.
     strlwr(buf);
+    stuffLen = strlen(buf);
     for(i = 0; buf[i]; ++i)
     {
         switch(buf[i])
         {
         case 'a':
-            Con_Printf("Ammo given.\n");
-            Cht_GiveFunc(plyr, 0, true, 0, 0, NULL);
+            {
+            boolean             giveAll = true;
+
+            if(i < stuffLen)
+            {
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_AMMO_TYPES)
+                {   // Give one specific ammo type.
+                    plyr->update |= PSF_AMMO;
+                    plyr->ammo[idx] = plyr->maxAmmo[idx];
+                    giveAll = false;
+                    i++;
+                }
+            }
+
+            if(giveAll)
+            {
+                Con_Printf("All ammo given.\n");
+                Cht_GiveFunc(plyr, 0, true, 0, 0, NULL);
+            }
             break;
-
+            }
         case 'b':
             if(Cht_PowerUpFunc(plyr, PT_STRENGTH))
                 Con_Printf("Your vision blurs! Yaarrrgh!!\n");
@@ -767,10 +789,30 @@
             break;
 
         case 'k':
-            Con_Printf("Key cards and skulls given.\n");
-            Cht_GiveFunc(plyr, 0, 0, 0, true, NULL);
+            {
+            boolean             giveAll = true;
+
+            if(i < stuffLen)
+            {
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_KEY_TYPES)
+                {   // Give one specific key.
+                    plyr->update |= PSF_KEYS;
+                    plyr->keys[idx] = true;
+                    giveAll = false;
+                    i++;
+                }
+            }
+
+            if(giveAll)
+            {
+                Con_Printf("Key cards and skulls given.\n");
+                Cht_GiveFunc(plyr, 0, 0, 0, true, NULL);
+            }
             break;
-
+            }
         case 'm':
             Con_Printf("Computer area map given.\n");
             Cht_PowerUpFunc(plyr, PT_ALLMAP);
@@ -797,21 +839,33 @@
             break;
 
         case 'w':
-            Con_Printf("Weapons given.\n");
-            Cht_GiveFunc(plyr, true, 0, 0, 0, NULL);
-            break;
+            {
+            boolean             giveAll = true;
 
-        default:
-            // Individual Weapon.
-            weapNum = ((int) buf[i]) - 48;
-            if(weapNum >= 0 && weapNum < NUM_WEAPON_TYPES)
+            if(i < stuffLen)
             {
-               P_GiveWeapon(plyr, weapNum, false);
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_WEAPON_TYPES)
+                {   // Give one specific weapon.
+                    P_GiveWeapon(plyr, idx, false);
+                    giveAll = false;
+                    i++;
+                }
             }
-            else // Unrecognized.
+
+            if(giveAll)
             {
-                Con_Printf("What do you mean, '%c'?\n", buf[i]);
+                Con_Printf("All weapons given.\n");
+                Cht_GiveFunc(plyr, true, 0, 0, 0, NULL);
             }
+            break;
+            }
+        default:
+            // Unrecognized
+            Con_Printf("What do you mean, '%c'?\n", buf[i]);
+            break;
         }
     }
     return true;

Modified: trunk/doomsday/plugins/jhexen/src/m_cheat.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/m_cheat.c	2008-04-08 01:10:00 UTC (rev 5642)
+++ trunk/doomsday/plugins/jhexen/src/m_cheat.c	2008-04-08 14:54:21 UTC (rev 5643)
@@ -1034,9 +1034,8 @@
 DEFCC(CCmdCheatGive)
 {
     char                buf[100];
-    int                 i;
-    int                 weapNum;
-    player_t           *plyr = &players[CONSOLEPLAYER];
+    player_t*           plyr = &players[CONSOLEPLAYER];
+    size_t              i, stuffLen;
 
     if(IS_CLIENT)
     {
@@ -1057,13 +1056,15 @@
     {
         Con_Printf("Usage:\n  give (stuff)\n");
         Con_Printf("  give (stuff) (player)\n");
-        Con_Printf("Stuff consists of one or more of:\n");
+        Con_Printf("Stuff consists of one or more of (type:id). "
+                   "If no id; give all of type:\n");
         Con_Printf(" a - artifacts\n");
         Con_Printf(" h - health\n");
         Con_Printf(" k - keys\n");
         Con_Printf(" p - puzzle\n");
         Con_Printf(" w - weapons\n");
-        Con_Printf(" 0-4 - weapon\n");
+        Con_Printf("Example: 'give akw' gives artifacts, keys and weapons.\n");
+        Con_Printf("Example: 'give w2k1' gives weapon two and key one.\n");
         return true;
     }
 
@@ -1086,6 +1087,7 @@
 
     strcpy(buf, argv[1]); // Stuff is the 2nd arg.
     strlwr(buf);
+    stuffLen = strlen(buf);
     for(i = 0; buf[i]; ++i)
     {
         switch(buf[i])
@@ -1101,29 +1103,64 @@
             break;
 
         case 'k':
-            Con_Printf("Keys given.\n");
-            CheatKeysFunc(plyr, NULL);
+            {
+            boolean             giveAll = true;
+
+            if(i < stuffLen)
+            {
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_KEY_TYPES)
+                {   // Give one specific key.
+                    plyr->update |= PSF_KEYS;
+                    plyr->keys |= (1 << idx);
+                    giveAll = false;
+                    i++;
+                }
+            }
+
+            if(giveAll)
+            {
+                Con_Printf("All Keys given.\n");
+                CheatKeysFunc(plyr, NULL);
+            }
             break;
-
+            }
         case 'p':
             Con_Printf("Puzzle parts given.\n");
             CheatPuzzleFunc(plyr, NULL);
             break;
 
         case 'w':
-            Con_Printf("Weapons given.\n");
-            CheatWeaponsFunc(plyr, NULL);
-            break;
+            {
+            boolean             giveAll = true;
 
-        default:
-            // Individual Weapon.
-            weapNum = ((int) buf[i]) - 48;
-            if(weapNum >= 0 && weapNum < NUM_WEAPON_TYPES)
+            if(i < stuffLen)
             {
-               plyr->weaponOwned[weapNum] = true;
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_WEAPON_TYPES)
+                {   // Give one specific weapon.
+                    plyr->update |= PSF_OWNED_WEAPONS;
+                    plyr->weaponOwned[idx] = true;
+                    giveAll = false;
+                    i++;
+                }
             }
-            else// Unrecognized.
-                Con_Printf("What do you mean, '%c'?\n", buf[i]);
+
+            if(giveAll)
+            {
+                Con_Printf("All weapons given.\n");
+                CheatWeaponsFunc(plyr, NULL);
+            }
+            break;
+            }
+        default:
+            // Unrecognized
+            Con_Printf("What do you mean, '%c'?\n", buf[i]);
+            break;
         }
     }
 

Modified: trunk/doomsday/plugins/wolftc/src/m_cheat.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/m_cheat.c	2008-04-08 01:10:00 UTC (rev 5642)
+++ trunk/doomsday/plugins/wolftc/src/m_cheat.c	2008-04-08 14:54:21 UTC (rev 5643)
@@ -657,10 +657,9 @@
 
 DEFCC(CCmdCheatGive)
 {
-    char    buf[100];
-    int     i;
-    int     weapNum;
-    player_t *plyr = &players[CONSOLEPLAYER];
+    char                buf[100];
+    player_t*           plyr = &players[CONSOLEPLAYER];
+    size_t              i, stuffLen;
 
     if(IS_CLIENT)
     {
@@ -670,13 +669,16 @@
         NetCl_CheatRequest(buf);
         return true;
     }
+
     if(IS_NETGAME && !netSvAllowCheats)
         return false;
+
     if(argc != 2 && argc != 3)
     {
         Con_Printf("Usage:\n  give (stuff)\n");
         Con_Printf("  give (stuff) (player)\n");
-        Con_Printf("Stuff consists of one or more of:\n");
+        Con_Printf("Stuff consists of one or more of (type:id). "
+                   "If no id; give all of type:\n");
         Con_Printf(" a - ammo\n");
         Con_Printf(" b - berserk\n");
         Con_Printf(" f - the power of flight\n");
@@ -689,8 +691,8 @@
         Con_Printf(" s - radiation shielding suit\n");
         Con_Printf(" v - invisibility\n");
         Con_Printf(" w - weapons\n");
-        Con_Printf(" 0-8 - weapon\n");
         Con_Printf("Example: 'give arw' corresponds the cheat IDFA.\n");
+        Con_Printf("Example: 'give w2k1' gives weapon two and key one.\n");
         return true;
     }
 
@@ -713,15 +715,36 @@
 
     strcpy(buf, argv[1]);       // Stuff is the 2nd arg.
     strlwr(buf);
-    for(i = 0; buf[i]; i++)
+    stuffLen = strlen(buf);
+    for(i = 0; buf[i]; ++i)
     {
-        switch (buf[i])
+        switch(buf[i])
         {
         case 'a':
-            Con_Printf("Ammo given.\n");
-            Cht_GiveFunc(plyr, 0, true, 0, 0, NULL);
+            {
+            boolean             giveAll = true;
+
+            if(i < stuffLen)
+            {
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_AMMO_TYPES)
+                {   // Give one specific ammo type.
+                    plyr->update |= PSF_AMMO;
+                    plyr->ammo[idx] = plyr->maxAmmo[idx];
+                    giveAll = false;
+                    i++;
+                }
+            }
+
+            if(giveAll)
+            {
+                Con_Printf("All ammo given.\n");
+                Cht_GiveFunc(plyr, 0, true, 0, 0, NULL);
+            }
             break;
-
+            }
         case 'b':
             if(Cht_PowerUpFunc(plyr, PT_STRENGTH))
                 Con_Printf("Your vision blurs! Yaarrrgh!!\n");
@@ -743,10 +766,30 @@
             break;
 
         case 'k':
-            Con_Printf("Key cards and skulls given.\n");
-            Cht_GiveFunc(plyr, 0, 0, 0, true, NULL);
+            {
+            boolean             giveAll = true;
+
+            if(i < stuffLen)
+            {
+                int                 idx;
+
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_KEY_TYPES)
+                {   // Give one specific key.
+                    plyr->update |= PSF_KEYS;
+                    plyr->keys[idx] = true;
+                    giveAll = false;
+                    i++;
+                }
+            }
+
+            if(giveAll)
+            {
+                Con_Printf("Key cards and skulls given.\n");
+                Cht_GiveFunc(plyr, 0, 0, 0, true, NULL);
+            }
             break;
-
+            }
         case 'm':
             Con_Printf("Computer area map given.\n");
             Cht_PowerUpFunc(plyr, PT_ALLMAP);
@@ -773,21 +816,33 @@
             break;
 
         case 'w':
-            Con_Printf("Weapons given.\n");
-            Cht_GiveFunc(plyr, true, 0, 0, 0, NULL);
-            break;
+            {
+            boolean             giveAll = true;
 
-        default:
-            // Individual Weapon
-            weapNum = ((int) buf[i]) - 48;
-            if(weapNum >= 0 && weapNum < NUM_WEAPON_TYPES)
+            if(i < stuffLen)
             {
-               P_GiveWeapon(plyr, weapNum, false);
-               return true;
+                int                 idx;
 
+                idx = ((int) buf[i+1]) - 48;
+                if(idx >= 0 && idx < NUM_WEAPON_TYPES)
+                {   // Give one specific weapon.
+                    P_GiveWeapon(plyr, idx, false);
+                    giveAll = false;
+                    i++;
+                }
             }
+
+            if(giveAll)
+            {
+                Con_Printf("All weapons given.\n");
+                Cht_GiveFunc(plyr, true, 0, 0, 0, NULL);
+            }
+            break;
+            }
+        default:
             // Unrecognized
             Con_Printf("What do you mean, '%c'?\n", buf[i]);
+            break;
         }
     }
     return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5645
          http://deng.svn.sourceforge.net/deng/?rev=5645&view=rev
Author:   danij
Date:     2008-04-08 09:31:17 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
Added (jDoom): Cvar "hud-keys-combine" and "Single key display" HUD menu option - Controls the default DOOM behaviour where keys of the same colour are only drawn once (e.g., if the player has both the red keycard and the red skull; only the red skull will be displayed). When disabled (the default), icons for all collected keys will be drawn.
Todo: the statusbar needs updating similarly.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/src/hu_menu.c
    trunk/doomsday/plugins/jdoom/data/conhelp.txt
    trunk/doomsday/plugins/jdoom/include/d_config.h
    trunk/doomsday/plugins/jdoom/src/d_main.c
    trunk/doomsday/plugins/jdoom/src/st_stuff.c

Modified: trunk/doomsday/plugins/common/src/hu_menu.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_menu.c	2008-04-08 16:08:24 UTC (rev 5644)
+++ trunk/doomsday/plugins/common/src/hu_menu.c	2008-04-08 16:31:17 UTC (rev 5645)
@@ -863,16 +863,15 @@
     {ITT_EFUNC, 0, "show power keys :", M_ToggleVar, 0, NULL, "hud-power" },
     {ITT_EFUNC, 0, "show health :", M_ToggleVar, 0, NULL,"hud-health" },
     {ITT_EFUNC, 0, "show keys :", M_ToggleVar, 0, NULL, "hud-keys" },
-
     {ITT_LRFUNC, 0, "scale", M_HUDScale, 0},
     {ITT_EFUNC, 0, "   HUD color", SCColorWidget, 5},
 #elif __JDOOM__
-    {ITT_EFUNC, 0, "show ammo :", M_ToggleVar, 0, NULL, "hud-ammo" },
-    {ITT_EFUNC, 0, "show armor :", M_ToggleVar, 0, NULL, "hud-armor" },
-    {ITT_EFUNC, 0, "show face :", M_ToggleVar, 0, NULL, "hud-face" },
-    {ITT_EFUNC, 0, "show health :", M_ToggleVar, 0, NULL,"hud-health" },
-    {ITT_EFUNC, 0, "show keys :", M_ToggleVar, 0, NULL, "hud-keys" },
-
+    {ITT_EFUNC, 0, "show ammo :", M_ToggleVar, 0, NULL, "hud-ammo"},
+    {ITT_EFUNC, 0, "show armor :", M_ToggleVar, 0, NULL, "hud-armor"},
+    {ITT_EFUNC, 0, "show face :", M_ToggleVar, 0, NULL, "hud-face"},
+    {ITT_EFUNC, 0, "show health :", M_ToggleVar, 0, NULL, "hud-health"},
+    {ITT_EFUNC, 0, "show keys :", M_ToggleVar, 0, NULL, "hud-keys"},
+    {ITT_EFUNC, 0, "single key display :", M_ToggleVar, 0, NULL, "hud-keys-combine"},
     {ITT_LRFUNC, 0, "scale", M_HUDScale, 0},
     {ITT_EFUNC, 0, "   HUD color", SCColorWidget, 5},
 #endif
@@ -940,7 +939,7 @@
 #elif __JDOOM64__
     11, HUDItems,
 #elif __JDOOM__
-    13, HUDItems,
+    14, HUDItems,
 #endif
     0, MENU_OPTIONS,
     huFontA,
@@ -954,7 +953,7 @@
 #elif __JDOOM64__
     0, 11
 #elif __JDOOM__
-    0, 13
+    0, 14
 #endif
 };
 
@@ -3142,8 +3141,9 @@
 
 void M_DrawHUDMenu(void)
 {
-    menu_t     *menu = &HUDDef;
-    char       *xhairnames[7] = {
+    int                 idx;
+    menu_t*             menu = &HUDDef;
+    char*               xhairnames[7] = {
         "NONE", "CROSS", "ANGLES", "SQUARE", "OPEN SQUARE", "DIAMOND", "V"
     };
 
@@ -3204,25 +3204,29 @@
         MN_DrawSlider(menu, 23, 10, cfg.hudScale * 10 - 3 + .5f);
     }
 #elif __JDOOM__ || __JDOOM64__
-    M_WriteMenuText(menu, 0, yesno[cfg.hudShown[HUD_AMMO]]);
-    M_WriteMenuText(menu, 1, yesno[cfg.hudShown[HUD_ARMOR]]);
+    idx = 0;
+    M_WriteMenuText(menu, idx++, yesno[cfg.hudShown[HUD_AMMO]]);
+    M_WriteMenuText(menu, idx++, yesno[cfg.hudShown[HUD_ARMOR]]);
 # if __JDOOM64__
-    M_WriteMenuText(menu, 2, yesno[cfg.hudShown[HUD_POWER]]);
+    M_WriteMenuText(menu, idx++, yesno[cfg.hudShown[HUD_POWER]]);
 # else
-    M_WriteMenuText(menu, 2, yesno[cfg.hudShown[HUD_FACE]]);
+    M_WriteMenuText(menu, idx++, yesno[cfg.hudShown[HUD_FACE]]);
 # endif
-    M_WriteMenuText(menu, 3, yesno[cfg.hudShown[HUD_HEALTH]]);
-    M_WriteMenuText(menu, 4, yesno[cfg.hudShown[HUD_KEYS]]);
-    MN_DrawSlider(menu, 5, 10, cfg.hudScale * 10 - 3 + .5f);
-    MN_DrawColorBox(menu,6, cfg.hudColor[0], cfg.hudColor[1],
+    M_WriteMenuText(menu, idx++, yesno[cfg.hudShown[HUD_HEALTH]]);
+    M_WriteMenuText(menu, idx++, yesno[cfg.hudShown[HUD_KEYS]]);
+# if __JDOOM__
+    M_WriteMenuText(menu, idx++, yesno[cfg.hudKeysCombine]);
+# endif
+    MN_DrawSlider(menu, idx++, 10, cfg.hudScale * 10 - 3 + .5f);
+    MN_DrawColorBox(menu, idx++, cfg.hudColor[0], cfg.hudColor[1],
                     cfg.hudColor[2], menuAlpha);
-    M_WriteMenuText(menu, 7, yesno[cfg.msgShow != 0]);
-    M_WriteMenuText(menu, 8, xhairnames[cfg.xhair]);
-    MN_DrawSlider(menu, 9, 9, cfg.xhairSize);
-    MN_DrawSlider(menu, 10, 11, cfg.screenBlocks - 3 );
+    M_WriteMenuText(menu, idx++, yesno[cfg.msgShow != 0]);
+    M_WriteMenuText(menu, idx++, xhairnames[cfg.xhair]);
+    MN_DrawSlider(menu, idx++, 9, cfg.xhairSize);
+    MN_DrawSlider(menu, idx++, 11, cfg.screenBlocks - 3 );
 # if !__JDOOM64__
-    MN_DrawSlider(menu, 11, 20, cfg.statusbarScale - 1);
-    MN_DrawSlider(menu, 12, 11, cfg.statusbarAlpha * 10 + .25f);
+    MN_DrawSlider(menu, idx++, 20, cfg.statusbarScale - 1);
+    MN_DrawSlider(menu, idx++, 11, cfg.statusbarAlpha * 10 + .25f);
 # endif
 #endif
 }

Modified: trunk/doomsday/plugins/jdoom/data/conhelp.txt
===================================================================
--- trunk/doomsday/plugins/jdoom/data/conhelp.txt	2008-04-08 16:08:24 UTC (rev 5644)
+++ trunk/doomsday/plugins/jdoom/data/conhelp.txt	2008-04-08 16:31:17 UTC (rev 5645)
@@ -667,6 +667,9 @@
 [hud-keys]
 desc = 1=Show keys in HUD.
 
+[hud-keys-combine]
+desc = 1=Combine the display of keys of the same color in HUD.
+
 [hud-frags]
 desc = 1=Show deathmatch frags in HUD.
 

Modified: trunk/doomsday/plugins/jdoom/include/d_config.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/d_config.h	2008-04-08 16:08:24 UTC (rev 5644)
+++ trunk/doomsday/plugins/jdoom/include/d_config.h	2008-04-08 16:31:17 UTC (rev 5645)
@@ -95,8 +95,9 @@
     float           flashColor[3];
     int             flashSpeed;
     byte            turningSkull;
-    byte            hudShown[NUMHUDDISPLAYS];   // HUD data visibility.
-    float           hudScale;      // How to scale HUD data?
+    byte            hudShown[NUMHUDDISPLAYS]; // HUD data visibility.
+    byte            hudKeysCombine; // One icon per color (e.g. if red key and red skull is owned only show red key).
+    float           hudScale; // How to scale HUD data?
     float           hudColor[4];
     float           hudIconAlpha;
     float           hudTimer; // Number of seconds until the hud/statusbar auto-hides.

Modified: trunk/doomsday/plugins/jdoom/src/d_main.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/d_main.c	2008-04-08 16:08:24 UTC (rev 5644)
+++ trunk/doomsday/plugins/jdoom/src/d_main.c	2008-04-08 16:31:17 UTC (rev 5645)
@@ -377,6 +377,7 @@
     cfg.flashColor[2] = 1;
     cfg.flashSpeed = 4;
     cfg.turningSkull = true;
+    cfg.hudKeysCombine = false;
     cfg.hudShown[HUD_HEALTH] = true;
     cfg.hudShown[HUD_ARMOR] = true;
     cfg.hudShown[HUD_AMMO] = true;

Modified: trunk/doomsday/plugins/jdoom/src/st_stuff.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/st_stuff.c	2008-04-08 16:08:24 UTC (rev 5644)
+++ trunk/doomsday/plugins/jdoom/src/st_stuff.c	2008-04-08 16:31:17 UTC (rev 5645)
@@ -352,10 +352,10 @@
     {"hud-armor", 0, CVT_BYTE, &cfg.hudShown[HUD_ARMOR], 0, 1},
     {"hud-ammo", 0, CVT_BYTE, &cfg.hudShown[HUD_AMMO], 0, 1},
     {"hud-keys", 0, CVT_BYTE, &cfg.hudShown[HUD_KEYS], 0, 1},
+    {"hud-keys-combine", 0, CVT_BYTE, &cfg.hudKeysCombine, 0, 1},
 
     // HUD displays
     {"hud-frags", 0, CVT_BYTE, &cfg.hudShown[HUD_FRAGS], 0, 1},
-
     {"hud-frags-all", 0, CVT_BYTE, &huShowAllFrags, 0, 1},
 
     {"hud-timer", 0, CVT_FLOAT, &cfg.hudTimer, 0, 60},
@@ -1087,36 +1087,70 @@
         }
     }
 
-    pos = width - 1;
+    pos = width - 2;
     if(cfg.hudShown[HUD_ARMOR])
     {
+        int                 maxArmor, armorOffset;
+
+        maxArmor = MAX_OF(armorPoints[0], armorPoints[1]);
+        maxArmor = MAX_OF(maxArmor, armorPoints[2]);
+        maxArmor = MAX_OF(maxArmor, armorPoints[2]);
+        sprintf(buf, "%i%%", maxArmor);
+        armorOffset = M_StringWidth(buf, huFontB);
+
         sprintf(buf, "%i%%", plr->armorPoints);
-        spr = plr->armorType == 2 ? SPR_ARM2 : SPR_ARM1;
-        ST_drawHUDSprite(spr, width - 49, height - 2, HOT_BRIGHT, iconAlpha);
+        pos -= armorOffset;
+        M_WriteText2(pos + armorOffset - M_StringWidth(buf, huFontB), height - 14, buf, huFontB,
+                     cfg.hudColor[0], cfg.hudColor[1], cfg.hudColor[2], textAlpha);
+        pos -= 2;
+
+        spr = (plr->armorType == 2 ? SPR_ARM2 : SPR_ARM1);
+        ST_drawHUDSprite(spr, pos, height - 2, HOT_BRIGHT, iconAlpha);
         ST_HUDSpriteSize(spr, &w, &h);
-
-        M_WriteText2(width - M_StringWidth(buf, huFontB) - 2, height - 14, buf, huFontB,
-                     cfg.hudColor[0], cfg.hudColor[1], cfg.hudColor[2], textAlpha);
-        pos = width - w - 52;
+        pos -= w + 2;
     }
 
-    // Keys  | use a bit of extra scale.
+    // Keys | use a bit of extra scale.
     if(cfg.hudShown[HUD_KEYS])
     {
+        static int          keyPairs[3][2] = {
+            {KT_REDCARD, KT_REDSKULL},
+            {KT_YELLOWCARD, KT_YELLOWSKULL},
+            {KT_BLUECARD, KT_BLUESKULL}
+        };
+        static int          keyIcons[NUM_KEY_TYPES] = {
+            SPR_BKEY,
+            SPR_YKEY,
+            SPR_RKEY,
+            SPR_BSKU,
+            SPR_YSKU,
+            SPR_RSKU
+        };
+
 Draw_BeginZoom(0.75f, pos , height - 2);
-        for(i = 0; i < 3; ++i)
+        for(i = 0; i < NUM_KEY_TYPES; ++i)
         {
-            spr = 0;
-            if(plr->
-               keys[i == 0 ? KT_REDCARD : i ==
-                     1 ? KT_YELLOWCARD : KT_BLUECARD])
-                spr = i == 0 ? SPR_RKEY : i == 1 ? SPR_YKEY : SPR_BKEY;
-            if(plr->
-               keys[i == 0 ? KT_REDSKULL : i ==
-                     1 ? KT_YELLOWSKULL : KT_BLUESKULL])
-                spr = i == 0 ? SPR_RSKU : i == 1 ? SPR_YSKU : SPR_BSKU;
-            if(spr)
+            boolean             shown = true;
+
+            if(!plr->keys[i])
+                continue;
+
+            if(cfg.hudKeysCombine)
             {
+                int                 j;
+
+                for(j = 0; j < 3; ++j)
+                    if(keyPairs[j][0] == i &&
+                       plr->keys[keyPairs[j][0]] && plr->keys[keyPairs[j][1]])
+                    {
+                        shown = false;
+                        break;
+                    }
+            }
+
+            if(shown)
+            {
+                spr = keyIcons[i];
                 ST_drawHUDSprite(spr, pos, height - 2, HOT_BRIGHT, iconAlpha);
                 ST_HUDSpriteSize(spr, &w, &h);
                 pos -= w + 2;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5648
          http://deng.svn.sourceforge.net/deng/?rev=5648&view=rev
Author:   danij
Date:     2008-04-08 14:34:55 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
Updated the games re the changes to ddfont_t.

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/src/d_console.c
    trunk/doomsday/plugins/jdoom64/src/d_console.c
    trunk/doomsday/plugins/jheretic/src/h_console.c
    trunk/doomsday/plugins/jhexen/src/hconsole.c
    trunk/doomsday/plugins/wolftc/src/d_console.c

Modified: trunk/doomsday/plugins/jdoom/src/d_console.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/d_console.c	2008-04-08 21:30:01 UTC (rev 5647)
+++ trunk/doomsday/plugins/jdoom/src/d_console.c	2008-04-08 21:34:55 UTC (rev 5648)
@@ -339,15 +339,15 @@
  */
 DEFCC(CCmdDoomFont)
 {
-    ddfont_t cfont;
+    ddfont_t            cfont;
 
     cfont.flags = DDFONT_WHITE;
     cfont.height = 8;
     cfont.sizeX = 1.5f;
     cfont.sizeY = 2;
-    cfont.TextOut = ConTextOut;
-    cfont.Width = ConTextWidth;
-    cfont.Filter = ConTextFilter;
+    cfont.drawText = ConTextOut;
+    cfont.getWidth = ConTextWidth;
+    cfont.filterText = ConTextFilter;
 
     Con_SetFont(&cfont);
     return true;

Modified: trunk/doomsday/plugins/jdoom64/src/d_console.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/d_console.c	2008-04-08 21:30:01 UTC (rev 5647)
+++ trunk/doomsday/plugins/jdoom64/src/d_console.c	2008-04-08 21:34:55 UTC (rev 5648)
@@ -353,9 +353,9 @@
     cfont.height = 8;
     cfont.sizeX = 1.5f;
     cfont.sizeY = 2;
-    cfont.TextOut = ConTextOut;
-    cfont.Width = ConTextWidth;
-    cfont.Filter = ConTextFilter;
+    cfont.drawText = ConTextOut;
+    cfont.getWidth = ConTextWidth;
+    cfont.filterText = ConTextFilter;
 
     Con_SetFont(&cfont);
     return true;

Modified: trunk/doomsday/plugins/jheretic/src/h_console.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/h_console.c	2008-04-08 21:30:01 UTC (rev 5647)
+++ trunk/doomsday/plugins/jheretic/src/h_console.c	2008-04-08 21:34:55 UTC (rev 5648)
@@ -347,9 +347,9 @@
     cfont.height = 9;
     cfont.sizeX = 1.2f;
     cfont.sizeY = 2;
-    cfont.TextOut = ConTextOut;
-    cfont.Width = ConTextWidth;
-    cfont.Filter = ConTextFilter;
+    cfont.drawText = ConTextOut;
+    cfont.getWidth = ConTextWidth;
+    cfont.filterText = ConTextFilter;
     Con_SetFont(&cfont);
     return true;
 }

Modified: trunk/doomsday/plugins/jhexen/src/hconsole.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/hconsole.c	2008-04-08 21:30:01 UTC (rev 5647)
+++ trunk/doomsday/plugins/jhexen/src/hconsole.c	2008-04-08 21:34:55 UTC (rev 5648)
@@ -337,9 +337,9 @@
     cfont.height = 9;
     cfont.sizeX = 1.2f;
     cfont.sizeY = 2;
-    cfont.TextOut = ConTextOut;
-    cfont.Width = ConTextWidth;
-    cfont.Filter = ConTextFilter;
+    cfont.drawText = ConTextOut;
+    cfont.getWidth = ConTextWidth;
+    cfont.filterText = ConTextFilter;
     Con_SetFont(&cfont);
     return true;
 }

Modified: trunk/doomsday/plugins/wolftc/src/d_console.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/d_console.c	2008-04-08 21:30:01 UTC (rev 5647)
+++ trunk/doomsday/plugins/wolftc/src/d_console.c	2008-04-08 21:34:55 UTC (rev 5648)
@@ -364,9 +364,9 @@
     cfont.height = 8;
     cfont.sizeX = 1.5f;
     cfont.sizeY = 2;
-    cfont.TextOut = ConTextOut;
-    cfont.Width = ConTextWidth;
-    cfont.Filter = ConTextFilter;
+    cfont.drawText = ConTextOut;
+    cfont.getWidth = ConTextWidth;
+    cfont.filterText = ConTextFilter;
 
     Con_SetFont(&cfont);
     return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5679
          http://deng.svn.sourceforge.net/deng/?rev=5679&view=rev
Author:   danij
Date:     2008-05-30 13:23:30 -0700 (Fri, 30 May 2008)

Log Message:
-----------
Further commonization of the plat_t interface. Clean up, style update.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/include/p_plat.h
    trunk/doomsday/plugins/common/src/p_plats.c
    trunk/doomsday/plugins/jdoom/src/p_spec.c
    trunk/doomsday/plugins/jdoom/src/p_switch.c
    trunk/doomsday/plugins/jdoom64/src/p_spec.c
    trunk/doomsday/plugins/jdoom64/src/p_switch.c
    trunk/doomsday/plugins/jheretic/src/p_spec.c
    trunk/doomsday/plugins/jheretic/src/p_switch.c
    trunk/doomsday/plugins/jhexen/src/p_spec.c
    trunk/doomsday/plugins/wolftc/src/p_spec.c
    trunk/doomsday/plugins/wolftc/src/p_switch.c

Modified: trunk/doomsday/plugins/common/include/p_plat.h
===================================================================
--- trunk/doomsday/plugins/common/include/p_plat.h	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/common/include/p_plat.h	2008-05-30 20:23:30 UTC (rev 5679)
@@ -37,23 +37,23 @@
 } platstate_e;
 
 typedef enum {
-    perpetualRaise,
-    downWaitUpStay,
+    PT_PERPETUALRAISE,
+    PT_DOWNWAITUPSTAY,
 #if __JHEXEN__
-    downByValueWaitUpStay,
-    upWaitDownStay,
-    upByValueWaitDownStay,
+    PT_DOWNBYVALUEWAITUPSTAY,
+    PT_UPWAITDOWNSTAY,
+    PT_UPBYVALUEWAITDOWNSTAY,
 #else
 # if __JDOOM64__
-    upWaitDownStay, //jd64 kaiser - outcast
-    downWaitUpDoor, //jd64 kaiser - outcast
+    PT_UPWAITDOWNSTAY, //jd64 kaiser - outcast
+    PT_DOWNWAITUPDOOR, //jd64 kaiser - outcast
 # endif
-    raiseAndChange,
-    raiseToNearestAndChange,
+    PT_RAISEANDCHANGE,
+    PT_RAISETONEARESTANDCHANGE,
 # if __JDOOM__ || __JDOOM64__ || __WOLFTC__
-    blazeDWUS,
+    PT_DOWNWAITUPSTAYBLAZE,
 #  if __JDOOM64__
-    blazeDWUSplus16, //jd64
+    PT_DOWNWAITUPPLUS16STAYBLAZE, //jd64
 #  endif
 # endif
 #endif
@@ -70,11 +70,7 @@
     int             count;
     platstate_e     state;
     platstate_e     oldState;
-#if __JHEXEN__
-    int             crush;
-#else
     boolean         crush;
-#endif
     int             tag;
     plattype_e      type;
 } plat_t;
@@ -87,7 +83,7 @@
 #if __JHEXEN__
 int         EV_DoPlat(linedef_t* li, byte* args, plattype_e type,
                       int amount);
-int         P_PlatDeactivate(linedef_t* li, byte* args);
+int         P_PlatDeactivate(short tag);
 #else
 int         EV_DoPlat(linedef_t* li, plattype_e type, int amount);
 int         P_PlatActivate(short tag);

Modified: trunk/doomsday/plugins/common/src/p_plats.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_plats.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/common/src/p_plats.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -108,7 +108,7 @@
  *
  * @parm plat           Ptr to the plat to remove.
  */
-static void stopPlat(plat_t *plat)
+static void stopPlat(plat_t* plat)
 {
     P_ToXSector(plat->sector)->specialData = NULL;
 #if __JHEXEN__
@@ -138,8 +138,8 @@
             S_SectorSound(plat->sector, SORG_FLOOR, SFX_PLATFORMMOVE);
 #endif
 #if __JDOOM__ || __JDOOM64__ || __WOLFTC__
-        if(plat->type == raiseAndChange ||
-           plat->type == raiseToNearestAndChange)
+        if(plat->type == PT_RAISEANDCHANGE ||
+           plat->type == PT_RAISETONEARESTANDCHANGE)
         {
             if(!(levelTime & 7))
                 S_SectorSound(plat->sector, SORG_FLOOR, SFX_PLATFORMMOVE);
@@ -153,7 +153,7 @@
             SN_StartSequenceInSec(plat->sector, SEQ_PLATFORM);
 #else
 # if __JDOOM64__
-            if(plat->type != downWaitUpDoor) // jd64 added test
+            if(plat->type != PT_DOWNWAITUPDOOR) // jd64 added test
 # endif
                 S_SectorSound(plat->sector, SORG_FLOOR, SFX_PLATFORMSTART);
 #endif
@@ -171,19 +171,19 @@
 #endif
                 switch(plat->type)
                 {
-                case downWaitUpStay:
+                case PT_DOWNWAITUPSTAY:
 #if __JHEXEN__
-                case downByValueWaitUpStay:
+                case PT_DOWNBYVALUEWAITUPSTAY:
 #else
 # if !__JHERETIC__
-                case blazeDWUS:
-                case raiseToNearestAndChange:
+                case PT_DOWNWAITUPSTAYBLAZE:
+                case PT_RAISETONEARESTANDCHANGE:
 # endif
 # if __JDOOM64__
-                case blazeDWUSplus16: // jd64
-                case downWaitUpDoor: // jd64
+                case PT_DOWNWAITUPPLUS16STAYBLAZE: // jd64
+                case PT_DOWNWAITUPDOOR: // jd64
 # endif
-                case raiseAndChange:
+                case PT_RAISEANDCHANGE:
 #endif
                     stopPlat(plat);
                     break;
@@ -208,9 +208,9 @@
             switch(plat->type)
             {
 # if __JHEXEN__
-            case upByValueWaitDownStay:
+            case PT_UPBYVALUEWAITDOWNSTAY:
 # endif
-            case upWaitDownStay:
+            case PT_UPWAITDOWNSTAY:
                 stopPlat(plat);
                 break;
 
@@ -256,10 +256,10 @@
 }
 
 #if __JHEXEN__
-static int EV_DoPlat2(linedef_t *line, int tag, byte *args, plattype_e type,
+static int doPlat(linedef_t *line, int tag, byte *args, plattype_e type,
                       int amount)
 #else
-static int EV_DoPlat2(linedef_t *line, int tag, plattype_e type, int amount)
+static int doPlat(linedef_t *line, int tag, plattype_e type, int amount)
 #endif
 {
     int                 rtn = 0;
@@ -304,7 +304,7 @@
         switch(type)
         {
 #if !__JHEXEN__
-        case raiseToNearestAndChange:
+        case PT_RAISETONEARESTANDCHANGE:
             plat->speed = PLATSPEED * .5;
 
             P_SetIntp(sec, DMU_FLOOR_MATERIAL,
@@ -325,7 +325,7 @@
             S_SectorSound(sec, SORG_FLOOR, SFX_PLATFORMMOVE);
             break;
 
-        case raiseAndChange:
+        case PT_RAISEANDCHANGE:
             plat->speed = PLATSPEED * .5;
 
             P_SetIntp(sec, DMU_FLOOR_MATERIAL,
@@ -337,7 +337,7 @@
             S_SectorSound(sec, SORG_FLOOR, SFX_PLATFORMMOVE);
             break;
 #endif
-        case downWaitUpStay:
+        case PT_DOWNWAITUPSTAY:
             P_FindSectorSurroundingLowestFloor(sec, &plat->low);
 #if __JHEXEN__
             plat->low += 8;
@@ -360,7 +360,7 @@
             break;
 
 #if __JDOOM64__ || __JHEXEN__
-        case upWaitDownStay:
+        case PT_UPWAITDOWNSTAY:
             P_FindSectorSurroundingHighestFloor(sec, &plat->high);
 
             if(plat->high < floorHeight)
@@ -380,7 +380,7 @@
             break;
 #endif
 #if __JDOOM64__
-        case downWaitUpDoor: // jd64
+        case PT_DOWNWAITUPDOOR: // jd64
             plat->speed = PLATSPEED * 8;
             P_FindSectorSurroundingLowestFloor(sec, &plat->low);
 
@@ -395,7 +395,7 @@
             break;
 #endif
 #if __JHEXEN__
-       case downByValueWaitUpStay:
+       case PT_DOWNBYVALUEWAITUPSTAY:
             plat->low = floorHeight - (float) args[3] * 8;
             if(plat->low > floorHeight)
                 plat->low = floorHeight;
@@ -404,7 +404,7 @@
             plat->state = PS_DOWN;
             break;
 
-        case upByValueWaitDownStay:
+        case PT_UPBYVALUEWAITDOWNSTAY:
             plat->high = floorHeight + (float) args[3] * 8;
             if(plat->high < floorHeight)
                 plat->high = floorHeight;
@@ -414,7 +414,7 @@
             break;
 #endif
 #if __JDOOM__ || __JDOOM64__
-        case blazeDWUS:
+        case PT_DOWNWAITUPSTAYBLAZE:
             plat->speed = PLATSPEED * 8;
             P_FindSectorSurroundingLowestFloor(sec, &plat->low);
 
@@ -427,7 +427,7 @@
             S_SectorSound(sec, SORG_FLOOR, SFX_PLATFORMSTART);
             break;
 #endif
-        case perpetualRaise:
+        case PT_PERPETUALRAISE:
             P_FindSectorSurroundingLowestFloor(sec, &plat->low);
 #if __JHEXEN__
             plat->low += 8;
@@ -477,15 +477,15 @@
 #endif
 {
 #if __JHEXEN__
-    return EV_DoPlat2(line, (int) args[0], args, type, amount);
+    return doPlat(line, (int) args[0], args, type, amount);
 #else
-    int         rtn = 0;
-    xline_t    *xline = P_ToXLine(line);
+    int                 rtn = 0;
+    xline_t*            xline = P_ToXLine(line);
 
-    // Activate all <type> plats that are in_stasis
+    // Activate all <type> plats that are in stasis.
     switch(type)
     {
-    case perpetualRaise:
+    case PT_PERPETUALRAISE:
         rtn = P_PlatActivate(xline->tag);
         break;
 
@@ -493,7 +493,7 @@
         break;
     }
 
-    return EV_DoPlat2(line, xline->tag, type, amount) || rtn;
+    return doPlat(line, xline->tag, type, amount) || rtn;
 #endif
 }
 
@@ -538,6 +538,7 @@
 
 typedef struct {
     short               tag;
+    int                 count;
 } deactivateplatparams_t;
 
 static boolean deactivatePlat(thinker_t* th, void* context)
@@ -551,6 +552,7 @@
     {
         // Destroy it.
         stopPlat(plat);
+        params->count++;
         return false; // Stop iteration.
     }
 #else
@@ -560,6 +562,7 @@
         // Put it in stasis.
         plat->oldState = plat->state;
         P_ThinkerSetStasis(&plat->thinker, true);
+        params->count++;
     }
 #endif
 
@@ -571,25 +574,15 @@
  *
  * @param tag           Tag of plats to put into stasis.
  *
- * @return              @c true, if a plat was put in stasis.
+ * @return              Number of plats put into stasis.
  */
-#if __JHEXEN__
-int P_PlatDeactivate(linedef_t *line, byte *args)
-#else
 int P_PlatDeactivate(short tag)
-#endif
 {
-#if __JHEXEN__
-    int                 tag = (int) args[0];
-#endif
     deactivateplatparams_t params;
 
     params.tag = tag;
+    params.count = 0;
     P_IterateThinkers(T_PlatRaise, deactivatePlat, &params);
 
-#if __JHEXEN__
-    return false;
-#else
-    return true;
-#endif
+    return params.count;
 }

Modified: trunk/doomsday/plugins/jdoom/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_spec.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/jdoom/src/p_spec.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -384,7 +384,7 @@
 
     case 10:
         // PlatDownWaitUp
-        EV_DoPlat(line, downWaitUpStay, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0);
         xline->special = 0;
         break;
 
@@ -420,7 +420,7 @@
 
     case 22:
         // Raise floor to nearest height and change texture.
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         xline->special = 0;
         break;
 
@@ -486,7 +486,7 @@
 
     case 53:
         // Perpetual Platform Raise.
-        EV_DoPlat(line, perpetualRaise, 0);
+        EV_DoPlat(line, PT_PERPETUALRAISE, 0);
         xline->special = 0;
         break;
 
@@ -558,7 +558,7 @@
 
     case 121:
         // Blazing PlatDownWaitUpStay.
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         xline->special = 0;
         break;
 
@@ -656,12 +656,12 @@
 
     case 87:
         // Perpetual Platform Raise.
-        EV_DoPlat(line, perpetualRaise, 0);
+        EV_DoPlat(line, PT_PERPETUALRAISE, 0);
         break;
 
     case 88:
         // PlatDownWaitUp.
-        EV_DoPlat(line, downWaitUpStay, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0);
         break;
 
     case 89:
@@ -696,7 +696,7 @@
 
     case 95:
         // Raise floor to nearest height and change texture.
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         break;
 
     case 96:
@@ -731,7 +731,7 @@
 
     case 120:
         // Blazing PlatDownWaitUpStay.
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         break;
 
     case 126:
@@ -786,7 +786,7 @@
 
     case 47:
         // RAISE FLOOR NEAR AND CHANGE
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         P_ChangeSwitchTexture(line, 0);
         break;
 

Modified: trunk/doomsday/plugins/jdoom/src/p_switch.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_switch.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/jdoom/src/p_switch.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -160,13 +160,13 @@
 
     case 14:
         // Raise Floor 32 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 32))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 32))
             P_ChangeSwitchTexture(line, 0);
         break;
 
     case 15:
         // Raise Floor 24 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 24))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 24))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -178,13 +178,13 @@
 
     case 20:
         // Raise Plat next highest floor and change texture.
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+        if(EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
     case 21:
         // PlatDownWaitUpStay.
-        if(EV_DoPlat(line, downWaitUpStay, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -284,7 +284,7 @@
 
     case 122:
         // Blazing PlatDownWaitUpStay.
-        if(EV_DoPlat(line, blazeDWUS, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -349,7 +349,7 @@
 
     case 62:
         // PlatDownWaitUpStay.
-        if(EV_DoPlat(line, downWaitUpStay, 1))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAY, 1))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -367,13 +367,13 @@
 
     case 66:
         // Raise Floor 24 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 24))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 24))
             P_ChangeSwitchTexture(line, 1);
         break;
 
     case 67:
         // Raise Floor 32 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 32))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 32))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -385,7 +385,7 @@
 
     case 68:
         // Raise Plat to next highest floor and change texture.
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+        if(EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -421,7 +421,7 @@
 
     case 123:
         // Blazing PlatDownWaitUpStay.
-        if(EV_DoPlat(line, blazeDWUS, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0))
             P_ChangeSwitchTexture(line, 1);
         break;
 

Modified: trunk/doomsday/plugins/jdoom64/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_spec.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/jdoom64/src/p_spec.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -388,7 +388,7 @@
 
     case 10:
         // PlatDownWaitUp
-        EV_DoPlat(line, downWaitUpStay, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0);
         xline->special = 0;
         break;
 
@@ -424,7 +424,7 @@
 
     case 22:
         // Raise floor to nearest height and change texture
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         xline->special = 0;
         break;
 
@@ -552,7 +552,7 @@
 
     case 53:
         // Perpetual Platform Raise
-        EV_DoPlat(line, perpetualRaise, 0);
+        EV_DoPlat(line, PT_PERPETUALRAISE, 0);
         xline->special = 0;
         break;
 
@@ -624,7 +624,7 @@
 
     case 121:
         // Blazing PlatDownWaitUpStay
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         xline->special = 0;
         break;
 
@@ -722,17 +722,17 @@
 
     case 87:
         // Perpetual Platform Raise
-        EV_DoPlat(line, perpetualRaise, 0);
+        EV_DoPlat(line, PT_PERPETUALRAISE, 0);
         break;
 
     case 88:
         // PlatDownWaitUp
-        EV_DoPlat(line, downWaitUpStay, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0);
         break;
 
     case 415: // jd64
         if(thing->player)
-            EV_DoPlat(line, upWaitDownStay, 0);
+            EV_DoPlat(line, PT_UPWAITDOWNSTAY, 0);
         break;
 
     case 89:
@@ -768,7 +768,7 @@
     case 95:
         // Raise floor to nearest height
         // and change texture.
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         break;
 
     case 96:
@@ -810,7 +810,7 @@
 
     case 120:
         // Blazing PlatDownWaitUpStay.
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         break;
 
     case 126:
@@ -876,13 +876,13 @@
 
     case 47:
         // RAISE FLOOR NEAR AND CHANGE
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         P_ChangeSwitchTexture(line, 0);
         break;
 
     case 191: // jd64
         // LOWER FLOOR WAIT RAISE
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         P_ChangeSwitchTexture(line, 1);
         break;
     }

Modified: trunk/doomsday/plugins/jdoom64/src/p_switch.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_switch.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/jdoom64/src/p_switch.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -168,13 +168,13 @@
 
     case 14:
         // Raise Floor 32 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 32))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 32))
             P_ChangeSwitchTexture(line, 0);
         break;
 
     case 15:
         // Raise Floor 24 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 24))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 24))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -186,13 +186,13 @@
 
     case 20:
         // Raise Plat next highest floor and change texture.
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+        if(EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
     case 21:
         // PlatDownWaitUpStay.
-        if(EV_DoPlat(line, downWaitUpStay, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -292,7 +292,7 @@
 
     case 122:
         // Blazing PlatDownWaitUpStay.
-        if(EV_DoPlat(line, blazeDWUS, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -357,7 +357,7 @@
 
     case 62:
         // PlatDownWaitUpStay.
-        if(EV_DoPlat(line, downWaitUpStay, 1))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAY, 1))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -375,13 +375,13 @@
 
     case 66:
         // Raise Floor 24 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 24))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 24))
             P_ChangeSwitchTexture(line, 1);
         break;
 
     case 67:
         // Raise Floor 32 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 32))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 32))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -393,7 +393,7 @@
 
     case 68:
         // Raise Plat to next highest floor and change texture.
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+        if(EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -429,7 +429,7 @@
 
     case 123:
         // Blazing PlatDownWaitUpStay.
-        if(EV_DoPlat(line, blazeDWUS, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -469,7 +469,7 @@
         break;
 
     case 414: // jd64
-        if(EV_DoPlat(line, upWaitDownStay, 1))
+        if(EV_DoPlat(line, PT_UPWAITDOWNSTAY, 1))
             P_ChangeSwitchTexture(line, 1);
         break;
 

Modified: trunk/doomsday/plugins/jheretic/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_spec.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/jheretic/src/p_spec.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -318,7 +318,7 @@
 
     case 10:
         // PlatDownWaitUp
-        EV_DoPlat(line, downWaitUpStay, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0);
         xline->special = 0;
         break;
 
@@ -354,7 +354,7 @@
 
     case 22:
         // Raise floor to nearest height and change texture
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         xline->special = 0;
         break;
 
@@ -421,7 +421,7 @@
 
     case 53:
         // Perpetual Platform Raise
-        EV_DoPlat(line, perpetualRaise, 0);
+        EV_DoPlat(line, PT_PERPETUALRAISE, 0);
         xline->special = 0;
         break;
 
@@ -495,7 +495,7 @@
 
     case 121:
         // Blazing PlatDownWaitUpStay
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         xline->special = 0;
         break;
 */
@@ -604,12 +604,12 @@
 
     case 87:
         // Perpetual Platform Raise
-        EV_DoPlat(line, perpetualRaise, 0);
+        EV_DoPlat(line, PT_PERPETUALRAISE, 0);
         break;
 
     case 88:
         // PlatDownWaitUp
-        EV_DoPlat(line, downWaitUpStay, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0);
         break;
 
     case 89:
@@ -645,7 +645,7 @@
     case 95:
         // Raise floor to nearest height
         // and change texture.
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         break;
 
     case 96:
@@ -688,7 +688,7 @@
 
     case 120:
         // Blazing PlatDownWaitUpStay.
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         break;
 
     case 126:
@@ -745,7 +745,7 @@
 
     case 47:
         // RAISE FLOOR NEAR AND CHANGE
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         P_ChangeSwitchTexture(line, 0);
         break;
 

Modified: trunk/doomsday/plugins/jheretic/src/p_switch.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_switch.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/jheretic/src/p_switch.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -135,12 +135,12 @@
         break;
 
     case 14: // Raise Floor 32 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 32))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 32))
             P_ChangeSwitchTexture(line, 0);
         break;
 
     case 15: // Raise Floor 24 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 24))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 24))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -150,12 +150,12 @@
         break;
 
     case 20: // Raise Plat next highest floor and change texture.
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+        if(EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
     case 21: // PlatDownWaitUpStay.
-        if(EV_DoPlat(line, downWaitUpStay, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -244,7 +244,7 @@
         break;
 
     case 62: // PlatDownWaitUpStay.
-        if(EV_DoPlat(line, downWaitUpStay, 1))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAY, 1))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -259,12 +259,12 @@
         break;
 
     case 66: // Raise Floor 24 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 24))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 24))
             P_ChangeSwitchTexture(line, 1);
         break;
 
     case 67: // Raise Floor 32 and change texture.
-        if(EV_DoPlat(line, raiseAndChange, 32))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 32))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -274,7 +274,7 @@
         break;
 
     case 68: // Raise Plat to next highest floor and change texture.
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+        if(EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0))
             P_ChangeSwitchTexture(line, 1);
         break;
 

Modified: trunk/doomsday/plugins/jhexen/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_spec.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/jhexen/src/p_spec.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -441,27 +441,27 @@
         break;
 
     case 60: // Plat Perpetual Raise
-        buttonSuccess = EV_DoPlat(line, args, perpetualRaise, 0);
+        buttonSuccess = EV_DoPlat(line, args, PT_PERPETUALRAISE, 0);
         break;
 
     case 61: // Plat Stop
-        P_PlatDeactivate(line, args);
+        P_PlatDeactivate((short) args[0]);
         break;
 
     case 62: // Plat Down-Wait-Up-Stay
-        buttonSuccess = EV_DoPlat(line, args, downWaitUpStay, 0);
+        buttonSuccess = EV_DoPlat(line, args, PT_DOWNWAITUPSTAY, 0);
         break;
 
     case 63: // Plat Down-by-Value*8-Wait-Up-Stay
-        buttonSuccess = EV_DoPlat(line, args, downByValueWaitUpStay, 0);
+        buttonSuccess = EV_DoPlat(line, args, PT_DOWNBYVALUEWAITUPSTAY, 0);
         break;
 
     case 64: // Plat Up-Wait-Down-Stay
-        buttonSuccess = EV_DoPlat(line, args, upWaitDownStay, 0);
+        buttonSuccess = EV_DoPlat(line, args, PT_UPWAITDOWNSTAY, 0);
         break;
 
     case 65: // Plat Up-by-Value*8-Wait-Down-Stay
-        buttonSuccess = EV_DoPlat(line, args, upByValueWaitDownStay, 0);
+        buttonSuccess = EV_DoPlat(line, args, PT_UPBYVALUEWAITDOWNSTAY, 0);
         break;
 
     case 66: // Floor Lower Instant * 8

Modified: trunk/doomsday/plugins/wolftc/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_spec.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/wolftc/src/p_spec.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -381,7 +381,7 @@
 
     case 10:
         // PlatDownWaitUp
-        EV_DoPlat(line, downWaitUpStay, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0);
         xline->special = 0;
         break;
 
@@ -417,7 +417,7 @@
 
     case 22:
         // Raise floor to nearest height and change texture
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         xline->special = 0;
         break;
 
@@ -484,7 +484,7 @@
 
     case 53:
         // Perpetual Platform Raise
-        EV_DoPlat(line, perpetualRaise, 0);
+        EV_DoPlat(line, PT_PERPETUALRAISE, 0);
         xline->special = 0;
         break;
 
@@ -556,7 +556,7 @@
 
     case 121:
         // Blazing PlatDownWaitUpStay
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         xline->special = 0;
         break;
 
@@ -654,12 +654,12 @@
 
     case 87:
         // Perpetual Platform Raise
-        EV_DoPlat(line, perpetualRaise, 0);
+        EV_DoPlat(line, PT_PERPETUALRAISE, 0);
         break;
 
     case 88:
         // PlatDownWaitUp
-        EV_DoPlat(line, downWaitUpStay, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0);
         break;
 
     case 89:
@@ -695,7 +695,7 @@
     case 95:
         // Raise floor to nearest height
         // and change texture.
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         break;
 
     case 96:
@@ -731,7 +731,7 @@
 
     case 120:
         // Blazing PlatDownWaitUpStay.
-        EV_DoPlat(line, blazeDWUS, 0);
+        EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0);
         break;
 
     case 126:
@@ -790,7 +790,7 @@
 
     case 47:
         // RAISE FLOOR NEAR AND CHANGE
-        EV_DoPlat(line, raiseToNearestAndChange, 0);
+        EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0);
         P_ChangeSwitchTexture(line, 0);
         break;
     }

Modified: trunk/doomsday/plugins/wolftc/src/p_switch.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_switch.c	2008-05-30 19:30:26 UTC (rev 5678)
+++ trunk/doomsday/plugins/wolftc/src/p_switch.c	2008-05-30 20:23:30 UTC (rev 5679)
@@ -161,13 +161,13 @@
 
     case 14:
         // Raise Floor 32 and change texture
-        if(EV_DoPlat(line, raiseAndChange, 32))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 32))
             P_ChangeSwitchTexture(line, 0);
         break;
 
     case 15:
         // Raise Floor 24 and change texture
-        if(EV_DoPlat(line, raiseAndChange, 24))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 24))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -179,13 +179,13 @@
 
     case 20:
         // Raise Plat next highest floor and change texture
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+        if(EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
     case 21:
         // PlatDownWaitUpStay
-        if(EV_DoPlat(line, downWaitUpStay, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAY, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -285,7 +285,7 @@
 
     case 122:
         // Blazing PlatDownWaitUpStay
-        if(EV_DoPlat(line, blazeDWUS, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0))
             P_ChangeSwitchTexture(line, 0);
         break;
 
@@ -350,7 +350,7 @@
 
     case 62:
         // PlatDownWaitUpStay
-        if(EV_DoPlat(line, downWaitUpStay, 1))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAY, 1))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -368,13 +368,13 @@
 
     case 66:
         // Raise Floor 24 and change texture
-        if(EV_DoPlat(line, raiseAndChange, 24))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 24))
             P_ChangeSwitchTexture(line, 1);
         break;
 
     case 67:
         // Raise Floor 32 and change texture
-        if(EV_DoPlat(line, raiseAndChange, 32))
+        if(EV_DoPlat(line, PT_RAISEANDCHANGE, 32))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -386,7 +386,7 @@
 
     case 68:
         // Raise Plat to next highest floor and change texture
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+        if(EV_DoPlat(line, PT_RAISETONEARESTANDCHANGE, 0))
             P_ChangeSwitchTexture(line, 1);
         break;
 
@@ -422,7 +422,7 @@
 
     case 123:
         // Blazing PlatDownWaitUpStay
-        if(EV_DoPlat(line, blazeDWUS, 0))
+        if(EV_DoPlat(line, PT_DOWNWAITUPSTAYBLAZE, 0))
             P_ChangeSwitchTexture(line, 1);
         break;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5683
          http://deng.svn.sourceforge.net/deng/?rev=5683&view=rev
Author:   danij
Date:     2008-05-30 22:31:03 -0700 (Fri, 30 May 2008)

Log Message:
-----------
Merged jHexen's EV_DoFloorAndCeiling and jDoom64's EV_DoSplitDoor.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/include/p_door.h
    trunk/doomsday/plugins/common/include/p_floor.h
    trunk/doomsday/plugins/common/src/p_door.c
    trunk/doomsday/plugins/common/src/p_floor.c
    trunk/doomsday/plugins/jdoom64/src/p_spec.c
    trunk/doomsday/plugins/jhexen/include/p_spec.h
    trunk/doomsday/plugins/jhexen/src/p_spec.c

Modified: trunk/doomsday/plugins/common/include/p_door.h
===================================================================
--- trunk/doomsday/plugins/common/include/p_door.h	2008-05-31 04:49:06 UTC (rev 5682)
+++ trunk/doomsday/plugins/common/include/p_door.h	2008-05-31 05:31:03 UTC (rev 5683)
@@ -90,7 +90,6 @@
 void        P_SpawnDoorRaiseIn5Mins(sector_t* sec);
 #endif
 #if __JDOOM64__
-int         EV_DoSplitDoor(linedef_t* li, int ftype, int ctype);
 int         EV_AnimateDoor(linedef_t* li, mobj_t* mo);
 #endif
 

Modified: trunk/doomsday/plugins/common/include/p_floor.h
===================================================================
--- trunk/doomsday/plugins/common/include/p_floor.h	2008-05-31 04:49:06 UTC (rev 5682)
+++ trunk/doomsday/plugins/common/include/p_floor.h	2008-05-31 05:31:03 UTC (rev 5683)
@@ -118,4 +118,10 @@
 int         EV_DoFloor(linedef_t* li, floortype_e type);
 #endif
 
+#if __JHEXEN__
+int         EV_DoFloorAndCeiling(linedef_t* li, byte* args, int ftype, int ctype);
+#elif __JDOOM64__
+int         EV_DoFloorAndCeiling(linedef_t* li, int ftype, int ctype);
 #endif
+
+#endif

Modified: trunk/doomsday/plugins/common/src/p_door.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_door.c	2008-05-31 04:49:06 UTC (rev 5682)
+++ trunk/doomsday/plugins/common/src/p_door.c	2008-05-31 05:31:03 UTC (rev 5683)
@@ -854,27 +854,3 @@
     door->topCountDown = 5 * 60 * TICSPERSEC;
 }
 #endif
-
-#if __JDOOM64__
-int EV_DoSplitDoor(linedef_t *line, int ftype, int ctype)
-{
-    boolean     floor, ceiling;
-    sector_t   *sec = NULL;
-    iterlist_t *list;
-
-    floor = EV_DoFloor(line, ftype);
-
-    list = P_GetSectorIterListForTag(P_ToXLine(line)->tag, false);
-    if(!list)
-        return 0;
-
-    P_IterListResetIterator(list, true);
-    while((sec = P_IterListIterator(list)) != NULL)
-    {
-        P_ToXSector(sec)->specialData = 0;
-    }
-
-    ceiling = EV_DoCeiling(line, ctype);
-    return (floor || ceiling);
-}
-#endif

Modified: trunk/doomsday/plugins/common/src/p_floor.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_floor.c	2008-05-31 04:49:06 UTC (rev 5682)
+++ trunk/doomsday/plugins/common/src/p_floor.c	2008-05-31 05:31:03 UTC (rev 5683)
@@ -61,7 +61,7 @@
 #include "p_mapspec.h"
 #include "p_tick.h"
 #include "p_floor.h"
-#if __JHEXEN__
+#if __JHEXEN__ || __JDOOM64__
 #include "p_ceiling.h"
 #endif
 
@@ -1363,51 +1363,58 @@
 
     return (found? 1 : 0);
 }
+#endif
 
-int EV_DoFloorAndCeiling(linedef_t *line, byte *args, boolean raise)
+#if __JHEXEN__ || __JDOOM64__
+# if __JHEXEN__
+int EV_DoFloorAndCeiling(linedef_t *line, byte *args, int ftype, int ctype)
+# else
+int EV_DoFloorAndCeiling(linedef_t* line, int ftype, int ctype)
+# endif
 {
-    boolean     floor, ceiling;
-    sector_t   *sec = NULL;
-    iterlist_t *list;
+# if __JHEXEN__
+    int                 tag = (int) args[0];
+# else
+    int                 tag = P_ToXLine(line)->tag;
+# endif
+    boolean             floor, ceiling;
+    sector_t*           sec = NULL;
+    iterlist_t*         list;
 
-    list = P_GetSectorIterListForTag((int) args[0], false);
+    list = P_GetSectorIterListForTag(tag, false);
     if(!list)
         return 0;
 
+    /** \kludge
+     * Due to the fact that sectors can only have one special thinker
+     * linked at a time, this routine manually removes the link before
+     * then creating a second thinker for the sector.
+     * In order to commonize this we should maintain seperate links in
+     * xsector_t for each type of special (not thinker type) i.e:
+     *
+     *   floor, ceiling, lightlevel
+     *
+     * Note: floor and ceiling are capable of moving at different speeds
+     * and with different target heights, we must remain compatible.
+     */
+
+# if __JHEXEN__
+    floor = EV_DoFloor(line, args, ftype);
+# else
+    floor = EV_DoFloor(line, ftype);
+# endif
     P_IterListResetIterator(list, true);
-
-    /** \kludge Original Hexen KLUDGE:
-    * Due to the fact that sectors can only have one special thinker
-    * linked at a time, this routine manually removes the link before
-    * then creating a second thinker for the sector.
-    * In order to commonize this we should maintain seperate links in
-    * xsector_t for each type of special (not thinker type) i.e:
-    *
-    *   floor, ceiling, lightlevel
-    *
-    * Note: floor and ceiling are capable of moving at different speeds
-    * and with different target heights, we must remain compatible.
-    */
-
-    if(raise)
+    while((sec = P_IterListIterator(list)) != NULL)
     {
-        floor = EV_DoFloor(line, args, FT_RAISEFLOORBYVALUE);
-        while((sec = P_IterListIterator(list)) != NULL)
-        {
-            P_ToXSector(sec)->specialData = NULL;
-        }
-        ceiling = EV_DoCeiling(line, args, CT_RAISEBYVALUE);
+        P_ToXSector(sec)->specialData = NULL;
     }
-    else
-    {
-        floor = EV_DoFloor(line, args, FT_LOWERBYVALUE);
-        while((sec = P_IterListIterator(list)) != NULL)
-        {
-            P_ToXSector(sec)->specialData = NULL;
-        }
-        ceiling = EV_DoCeiling(line, args, CT_LOWERBYVALUE);
-    }
+# if __JHEXEN__
+    ceiling = EV_DoCeiling(line, args, ctype);
+# else
+    ceiling = EV_DoCeiling(line, ctype);
+# endif
     // < KLUDGE
+
     return (floor | ceiling);
 }
 #endif

Modified: trunk/doomsday/plugins/jdoom64/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_spec.c	2008-05-31 04:49:06 UTC (rev 5682)
+++ trunk/doomsday/plugins/jdoom64/src/p_spec.c	2008-05-31 05:31:03 UTC (rev 5683)
@@ -471,7 +471,7 @@
         break;
 
     case 420: // jd64
-        EV_DoSplitDoor(line, FT_TOHIGHESTPLUS8, CT_RAISETOHIGHEST);
+        EV_DoFloorAndCeiling(line, FT_TOHIGHESTPLUS8, CT_RAISETOHIGHEST);
         xline->special = 0;
         break;
 
@@ -1732,7 +1732,7 @@
         break;
 
     case 416: // jd64
-        if(EV_DoSplitDoor(line, FT_TOHIGHESTPLUS8, CT_RAISETOHIGHEST))
+        if(EV_DoFloorAndCeiling(line, FT_TOHIGHESTPLUS8, CT_RAISETOHIGHEST))
             P_ChangeSwitchTexture(line, 0);
         break;
 

Modified: trunk/doomsday/plugins/jhexen/include/p_spec.h
===================================================================
--- trunk/doomsday/plugins/jhexen/include/p_spec.h	2008-05-31 04:49:06 UTC (rev 5682)
+++ trunk/doomsday/plugins/jhexen/include/p_spec.h	2008-05-31 05:31:03 UTC (rev 5683)
@@ -100,7 +100,6 @@
 
 int         EV_BuildStairs(linedef_t *line, byte *args, int direction,
                            stairs_e type);
-int         EV_DoFloorAndCeiling(linedef_t *line, byte *args, boolean raise);
 int         EV_FloorCrushStop(linedef_t *line, byte *args);
 
 #define TELEFOGHEIGHTF          (32)

Modified: trunk/doomsday/plugins/jhexen/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_spec.c	2008-05-31 04:49:06 UTC (rev 5682)
+++ trunk/doomsday/plugins/jhexen/src/p_spec.c	2008-05-31 05:31:03 UTC (rev 5683)
@@ -278,67 +278,67 @@
     return P_InventoryUseArtifact(mo->player, arti);
 }
 
-boolean P_ExecuteLineSpecial(int special, byte *args, linedef_t *line, int side,
-                             mobj_t *mo)
+boolean P_ExecuteLineSpecial(int special, byte* args, linedef_t* line,
+                             int side, mobj_t* mo)
 {
-    boolean     buttonSuccess;
+    boolean             success;
 
-    buttonSuccess = false;
+    success = false;
     switch(special)
     {
     case 1: // Poly Start Line
         break;
 
     case 2: // Poly Rotate Left
-        buttonSuccess = EV_RotatePoly(line, args, 1, false);
+        success = EV_RotatePoly(line, args, 1, false);
         break;
 
     case 3: // Poly Rotate Right
-        buttonSuccess = EV_RotatePoly(line, args, -1, false);
+        success = EV_RotatePoly(line, args, -1, false);
         break;
 
     case 4: // Poly Move
-        buttonSuccess = EV_MovePoly(line, args, false, false);
+        success = EV_MovePoly(line, args, false, false);
         break;
 
     case 5: // Poly Explicit Line:  Only used in initialization
         break;
 
     case 6: // Poly Move Times 8
-        buttonSuccess = EV_MovePoly(line, args, true, false);
+        success = EV_MovePoly(line, args, true, false);
         break;
 
     case 7: // Poly Door Swing
-        buttonSuccess = EV_OpenPolyDoor(line, args, PODOOR_SWING);
+        success = EV_OpenPolyDoor(line, args, PODOOR_SWING);
         break;
 
     case 8: // Poly Door Slide
-        buttonSuccess = EV_OpenPolyDoor(line, args, PODOOR_SLIDE);
+        success = EV_OpenPolyDoor(line, args, PODOOR_SLIDE);
         break;
 
     case 10: // Door Close
-        buttonSuccess = EV_DoDoor(line, args, DT_CLOSE);
+        success = EV_DoDoor(line, args, DT_CLOSE);
         break;
 
     case 11: // Door Open
         if(!args[0])
         {
-            buttonSuccess = EV_VerticalDoor(line, mo);
+            success = EV_VerticalDoor(line, mo);
         }
         else
         {
-            buttonSuccess = EV_DoDoor(line, args, DT_OPEN);
+            success = EV_DoDoor(line, args, DT_OPEN);
         }
         break;
 
     case 12: // Door Raise
         if(!args[0])
         {
-            buttonSuccess = EV_VerticalDoor(line, mo);
+            success = EV_VerticalDoor(line, mo);
         }
         else
         {
-            buttonSuccess = EV_DoDoor(line, args, DT_NORMAL);
+            success = EV_DoDoor(line, args, DT_NORMAL);
         }
         break;
 
@@ -347,105 +347,105 @@
         {
             if(!args[0])
             {
-                buttonSuccess = EV_VerticalDoor(line, mo);
+                success = EV_VerticalDoor(line, mo);
             }
             else
             {
-                buttonSuccess = EV_DoDoor(line, args, DT_NORMAL);
+                success = EV_DoDoor(line, args, DT_NORMAL);
             }
         }
         break;
 
     case 20: // Floor Lower by Value
-        buttonSuccess = EV_DoFloor(line, args, FT_LOWERBYVALUE);
+        success = EV_DoFloor(line, args, FT_LOWERBYVALUE);
         break;
 
     case 21: // Floor Lower to Lowest
-        buttonSuccess = EV_DoFloor(line, args, FT_LOWERTOLOWEST);
+        success = EV_DoFloor(line, args, FT_LOWERTOLOWEST);
         break;
 
     case 22: // Floor Lower to Nearest
-        buttonSuccess = EV_DoFloor(line, args, FT_LOWER);
+        success = EV_DoFloor(line, args, FT_LOWER);
         break;
 
     case 23: // Floor Raise by Value
-        buttonSuccess = EV_DoFloor(line, args, FT_RAISEFLOORBYVALUE);
+        success = EV_DoFloor(line, args, FT_RAISEFLOORBYVALUE);
         break;
 
     case 24: // Floor Raise to Highest
-        buttonSuccess = EV_DoFloor(line, args, FT_RAISEFLOOR);
+        success = EV_DoFloor(line, args, FT_RAISEFLOOR);
         break;
 
     case 25: // Floor Raise to Nearest
-        buttonSuccess = EV_DoFloor(line, args, FT_RAISEFLOORTONEAREST);
+        success = EV_DoFloor(line, args, FT_RAISEFLOORTONEAREST);
         break;
 
     case 26: // Stairs Build Down Normal
-        buttonSuccess = EV_BuildStairs(line, args, -1, STAIRS_NORMAL);
+        success = EV_BuildStairs(line, args, -1, STAIRS_NORMAL);
         break;
 
     case 27: // Build Stairs Up Normal
-        buttonSuccess = EV_BuildStairs(line, args, 1, STAIRS_NORMAL);
+        success = EV_BuildStairs(line, args, 1, STAIRS_NORMAL);
         break;
 
     case 28: // Floor Raise and Crush
-        buttonSuccess = EV_DoFloor(line, args, FT_RAISEFLOORCRUSH);
+        success = EV_DoFloor(line, args, FT_RAISEFLOORCRUSH);
         break;
 
     case 29: // Build Pillar (no crushing)
-        buttonSuccess = EV_BuildPillar(line, args, false);
+        success = EV_BuildPillar(line, args, false);
         break;
 
     case 30: // Open Pillar
-        buttonSuccess = EV_OpenPillar(line, args);
+        success = EV_OpenPillar(line, args);
         break;
 
     case 31: // Stairs Build Down Sync
-        buttonSuccess = EV_BuildStairs(line, args, -1, STAIRS_SYNC);
+        success = EV_BuildStairs(line, args, -1, STAIRS_SYNC);
         break;
 
     case 32: // Build Stairs Up Sync
-        buttonSuccess = EV_BuildStairs(line, args, 1, STAIRS_SYNC);
+        success = EV_BuildStairs(line, args, 1, STAIRS_SYNC);
         break;
 
     case 35: // Raise Floor by Value Times 8
-        buttonSuccess = EV_DoFloor(line, args, FT_RAISEBYVALUEMUL8);
+        success = EV_DoFloor(line, args, FT_RAISEBYVALUEMUL8);
         break;
 
     case 36: // Lower Floor by Value Times 8
-        buttonSuccess = EV_DoFloor(line, args, FT_LOWERBYVALUEMUL8);
+        success = EV_DoFloor(line, args, FT_LOWERBYVALUEMUL8);
         break;
 
     case 40: // Ceiling Lower by Value
-        buttonSuccess = EV_DoCeiling(line, args, CT_LOWERBYVALUE);
+        success = EV_DoCeiling(line, args, CT_LOWERBYVALUE);
         break;
 
     case 41: // Ceiling Raise by Value
-        buttonSuccess = EV_DoCeiling(line, args, CT_RAISEBYVALUE);
+        success = EV_DoCeiling(line, args, CT_RAISEBYVALUE);
         break;
 
     case 42: // Ceiling Crush and Raise
-        buttonSuccess = EV_DoCeiling(line, args, CT_CRUSHANDRAISE);
+        success = EV_DoCeiling(line, args, CT_CRUSHANDRAISE);
         break;
 
     case 43: // Ceiling Lower and Crush
-        buttonSuccess = EV_DoCeiling(line, args, CT_LOWERANDCRUSH);
+        success = EV_DoCeiling(line, args, CT_LOWERANDCRUSH);
         break;
 
     case 44: // Ceiling Crush Stop
-        buttonSuccess = P_CeilingDeactivate(line, args);
+        success = P_CeilingDeactivate(line, args);
         break;
 
     case 45: // Ceiling Crush Raise and Stay
-        buttonSuccess = EV_DoCeiling(line, args, CT_CRUSHRAISEANDSTAY);
+        success = EV_DoCeiling(line, args, CT_CRUSHRAISEANDSTAY);
         break;
 
     case 46: // Floor Crush Stop
-        buttonSuccess = EV_FloorCrushStop(line, args);
+        success = EV_FloorCrushStop(line, args);
         break;
 
     case 60: // Plat Perpetual Raise
-        buttonSuccess = EV_DoPlat(line, args, PT_PERPETUALRAISE, 0);
+        success = EV_DoPlat(line, args, PT_PERPETUALRAISE, 0);
         break;
 
     case 61: // Plat Stop
@@ -453,48 +453,48 @@
         break;
 
     case 62: // Plat Down-Wait-Up-Stay
-        buttonSuccess = EV_DoPlat(line, args, PT_DOWNWAITUPSTAY, 0);
+        success = EV_DoPlat(line, args, PT_DOWNWAITUPSTAY, 0);
         break;
 
     case 63: // Plat Down-by-Value*8-Wait-Up-Stay
-        buttonSuccess = EV_DoPlat(line, args, PT_DOWNBYVALUEWAITUPSTAY, 0);
+        success = EV_DoPlat(line, args, PT_DOWNBYVALUEWAITUPSTAY, 0);
         break;
 
     case 64: // Plat Up-Wait-Down-Stay
-        buttonSuccess = EV_DoPlat(line, args, PT_UPWAITDOWNSTAY, 0);
+        success = EV_DoPlat(line, args, PT_UPWAITDOWNSTAY, 0);
         break;
 
     case 65: // Plat Up-by-Value*8-Wait-Down-Stay
-        buttonSuccess = EV_DoPlat(line, args, PT_UPBYVALUEWAITDOWNSTAY, 0);
+        success = EV_DoPlat(line, args, PT_UPBYVALUEWAITDOWNSTAY, 0);
         break;
 
     case 66: // Floor Lower Instant * 8
-        buttonSuccess = EV_DoFloor(line, args, FT_LOWERMUL8INSTANT);
+        success = EV_DoFloor(line, args, FT_LOWERMUL8INSTANT);
         break;
 
     case 67: // Floor Raise Instant * 8
-        buttonSuccess = EV_DoFloor(line, args, FT_RAISEMUL8INSTANT);
+        success = EV_DoFloor(line, args, FT_RAISEMUL8INSTANT);
         break;
 
     case 68: // Floor Move to Value * 8
-        buttonSuccess = EV_DoFloor(line, args, FT_TOVALUEMUL8);
+        success = EV_DoFloor(line, args, FT_TOVALUEMUL8);
         break;
 
     case 69: // Ceiling Move to Value * 8
-        buttonSuccess = EV_DoCeiling(line, args, CT_MOVETOVALUEMUL8);
+        success = EV_DoCeiling(line, args, CT_MOVETOVALUEMUL8);
         break;
 
     case 70: // Teleport
         if(side == 0)
         {   // Only teleport when crossing the front side of a line
-            buttonSuccess = EV_Teleport(args[0], mo, true);
+            success = EV_Teleport(args[0], mo, true);
         }
         break;
 
     case 71: // Teleport, no fog
         if(side == 0)
         {   // Only teleport when crossing the front side of a line
-            buttonSuccess = EV_Teleport(args[0], mo, false);
+            success = EV_Teleport(args[0], mo, false);
         }
         break;
 
@@ -502,7 +502,7 @@
         if(!side) // Only thrust on side 0
         {
             P_ThrustMobj(mo, args[0] * (ANGLE_90 / 64), (float) args[1]);
-            buttonSuccess = 1;
+            success = 1;
         }
         break;
 
@@ -515,7 +515,7 @@
         {   // If arg1 is zero, then guarantee a kill
             P_DamageMobj(mo, NULL, NULL, 10000);
         }
-        buttonSuccess = 1;
+        success = 1;
         break;
 
     case 74: // Teleport_NewMap
@@ -525,7 +525,7 @@
             if(!(mo && mo->player && mo->player->playerState == PST_DEAD))
             {
                 G_LeaveLevel(args[0], args[1], false);
-                buttonSuccess = true;
+                success = true;
             }
         }
         break;
@@ -536,7 +536,7 @@
             // Players must be alive to teleport
             if(!(mo && mo->player && mo->player->playerState == PST_DEAD))
             {
-                buttonSuccess = true;
+                success = true;
                 if(deathmatch)
                 {
                     // Winning in deathmatch just goes back to map 1
@@ -552,136 +552,136 @@
         break;
 
     case 80: // ACS_Execute
-        buttonSuccess = P_StartACS(args[0], args[1], &args[2], mo, line, side);
+        success = P_StartACS(args[0], args[1], &args[2], mo, line, side);
         break;
 
     case 81: // ACS_Suspend
-        buttonSuccess = P_SuspendACS(args[0], args[1]);
+        success = P_SuspendACS(args[0], args[1]);
         break;
 
     case 82: // ACS_Terminate
-        buttonSuccess = P_TerminateACS(args[0], args[1]);
+        success = P_TerminateACS(args[0], args[1]);
         break;
 
     case 83: // ACS_LockedExecute
-        buttonSuccess = P_StartLockedACS(line, args, mo, side);
+        success = P_StartLockedACS(line, args, mo, side);
         break;
 
     case 90: // Poly Rotate Left Override
-        buttonSuccess = EV_RotatePoly(line, args, 1, true);
+        success = EV_RotatePoly(line, args, 1, true);
         break;
 
     case 91: // Poly Rotate Right Override
-        buttonSuccess = EV_RotatePoly(line, args, -1, true);
+        success = EV_RotatePoly(line, args, -1, true);
         break;
 
     case 92: // Poly Move Override
-        buttonSuccess = EV_MovePoly(line, args, false, true);
+        success = EV_MovePoly(line, args, false, true);
         break;
 
     case 93: // Poly Move Times 8 Override
-        buttonSuccess = EV_MovePoly(line, args, true, true);
+        success = EV_MovePoly(line, args, true, true);
         break;
 
     case 94: // Build Pillar Crush
-        buttonSuccess = EV_BuildPillar(line, args, true);
+        success = EV_BuildPillar(line, args, true);
         break;
 
     case 95: // Lower Floor and Ceiling
-        buttonSuccess = EV_DoFloorAndCeiling(line, args, false);
+        success = EV_DoFloorAndCeiling(line, args, FT_LOWERBYVALUE, CT_LOWERBYVALUE);
         break;
 
     case 96: // Raise Floor and Ceiling
-        buttonSuccess = EV_DoFloorAndCeiling(line, args, true);
+        success = EV_DoFloorAndCeiling(line, args, FT_RAISEFLOORBYVALUE, CT_RAISEBYVALUE);
         break;
 
     case 109: // Force Lightning
-        buttonSuccess = true;
+        success = true;
         P_ForceLightning();
         break;
 
     case 110: // Light Raise by Value
-        buttonSuccess = EV_SpawnLight(line, args, LITE_RAISEBYVALUE);
+        success = EV_SpawnLight(line, args, LITE_RAISEBYVALUE);
         break;
 
     case 111: // Light Lower by Value
-        buttonSuccess = EV_SpawnLight(line, args, LITE_LOWERBYVALUE);
+        success = EV_SpawnLight(line, args, LITE_LOWERBYVALUE);
         break;
 
     case 112: // Light Change to Value
-        buttonSuccess = EV_SpawnLight(line, args, LITE_CHANGETOVALUE);
+        success = EV_SpawnLight(line, args, LITE_CHANGETOVALUE);
         break;
 
     case 113: // Light Fade
-        buttonSuccess = EV_SpawnLight(line, args, LITE_FADE);
+        success = EV_SpawnLight(line, args, LITE_FADE);
         break;
 
     case 114: // Light Glow
-        buttonSuccess = EV_SpawnLight(line, args, LITE_GLOW);
+        success = EV_SpawnLight(line, args, LITE_GLOW);
         break;
 
     case 115: // Light Flicker
-        buttonSuccess = EV_SpawnLight(line, args, LITE_FLICKER);
+        success = EV_SpawnLight(line, args, LITE_FLICKER);
         break;
 
     case 116: // Light Strobe
-        buttonSuccess = EV_SpawnLight(line, args, LITE_STROBE);
+        success = EV_SpawnLight(line, args, LITE_STROBE);
         break;
 
     case 120: // Quake Tremor
-        buttonSuccess = A_LocalQuake(args, mo);
+        success = A_LocalQuake(args, mo);
         break;
 
     case 129: // UsePuzzleItem
-        buttonSuccess = EV_LineSearchForPuzzleItem(line, args, mo);
+        success = EV_LineSearchForPuzzleItem(line, args, mo);
         break;
 
     case 130: // Thing_Activate
-        buttonSuccess = EV_ThingActivate(args[0]);
+        success = EV_ThingActivate(args[0]);
         break;
 
     case 131: // Thing_Deactivate
-        buttonSuccess = EV_ThingDeactivate(args[0]);
+        success = EV_ThingDeactivate(args[0]);
         break;
 
     case 132: // Thing_Remove
-        buttonSuccess = EV_ThingRemove(args[0]);
+        success = EV_ThingRemove(args[0]);
         break;
 
     case 133: // Thing_Destroy
-        buttonSuccess = EV_ThingDestroy(args[0]);
+        success = EV_ThingDestroy(args[0]);
         break;
 
     case 134: // Thing_Projectile
-        buttonSuccess = EV_ThingProjectile(args, 0);
+        success = EV_ThingProjectile(args, 0);
         break;
 
     case 135: // Thing_Spawn
-        buttonSuccess = EV_ThingSpawn(args, 1);
+        success = EV_ThingSpawn(args, 1);
         break;
 
     case 136: // Thing_ProjectileGravity
-        buttonSuccess = EV_ThingProjectile(args, 1);
+        success = EV_ThingProjectile(args, 1);
         break;
 
     case 137: // Thing_SpawnNoFog
-        buttonSuccess = EV_ThingSpawn(args, 0);
+        success = EV_ThingSpawn(args, 0);
         break;
 
     case 138: // Floor_Waggle
-        buttonSuccess =
+        success =
             EV_StartFloorWaggle(args[0], args[1], args[2], args[3], args[4]);
         break;
 
     case 140: // Sector_SoundChange
-        buttonSuccess = EV_SectorSoundChange(args);
+        success = EV_SectorSoundChange(args);
         break;
 
     default:
         break;
     }
 
-    return buttonSuccess;
+    return success;
 }
 
 boolean P_ActivateLine(linedef_t *line, mobj_t *mo, int side, int activationType)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5685
          http://deng.svn.sourceforge.net/deng/?rev=5685&view=rev
Author:   danij
Date:     2008-05-30 23:00:16 -0700 (Fri, 30 May 2008)

Log Message:
-----------
Commonized P_CeilingDeactivate.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/include/p_ceiling.h
    trunk/doomsday/plugins/common/src/p_ceiling.c
    trunk/doomsday/plugins/jhexen/src/p_spec.c

Modified: trunk/doomsday/plugins/common/include/p_ceiling.h
===================================================================
--- trunk/doomsday/plugins/common/include/p_ceiling.h	2008-05-31 05:32:23 UTC (rev 5684)
+++ trunk/doomsday/plugins/common/include/p_ceiling.h	2008-05-31 06:00:16 UTC (rev 5685)
@@ -83,10 +83,6 @@
 #if __JDOOM__ || __JDOOM64__ || __JHERETIC__ || __WOLFTC__
 int         P_CeilingActivate(short tag);
 #endif
-#if __JHEXEN__
-int         P_CeilingDeactivate(linedef_t* line, byte* args);
-#else
 int         P_CeilingDeactivate(short tag);
-#endif
 
 #endif

Modified: trunk/doomsday/plugins/common/src/p_ceiling.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_ceiling.c	2008-05-31 05:32:23 UTC (rev 5684)
+++ trunk/doomsday/plugins/common/src/p_ceiling.c	2008-05-31 06:00:16 UTC (rev 5685)
@@ -566,16 +566,8 @@
  *
  * @return              @c true, if a ceiling put in stasis.
  */
-#if __JHEXEN__
-int P_CeilingDeactivate(linedef_t *line, byte *args)
-#else
 int P_CeilingDeactivate(short tag)
-#endif
 {
-#if __JHEXEN__
-    short               tag = (int) args[0];
-#endif
-
     deactivateceilingparams_t params;
 
     params.tag = tag;

Modified: trunk/doomsday/plugins/jhexen/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_spec.c	2008-05-31 05:32:23 UTC (rev 5684)
+++ trunk/doomsday/plugins/jhexen/src/p_spec.c	2008-05-31 06:00:16 UTC (rev 5685)
@@ -433,7 +433,7 @@
         break;
 
     case 44: // Ceiling Crush Stop
-        success = P_CeilingDeactivate(line, args);
+        success = P_CeilingDeactivate((short) args[0]);
         break;
 
     case 45: // Ceiling Crush Raise and Stay


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5686
          http://deng.svn.sourceforge.net/deng/?rev=5686&view=rev
Author:   danij
Date:     2008-05-31 02:41:58 -0700 (Sat, 31 May 2008)

Log Message:
-----------
Made sound effect and music identifiers in the games upper-case, to match our style guidelines.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/src/d_net.c
    trunk/doomsday/plugins/common/src/d_netsv.c
    trunk/doomsday/plugins/common/src/hu_menu.c
    trunk/doomsday/plugins/common/src/hu_msg.c
    trunk/doomsday/plugins/common/src/p_ceiling.c
    trunk/doomsday/plugins/common/src/p_door.c
    trunk/doomsday/plugins/common/src/p_floor.c
    trunk/doomsday/plugins/common/src/p_inventory.c
    trunk/doomsday/plugins/common/src/p_map.c
    trunk/doomsday/plugins/common/src/p_plat.c
    trunk/doomsday/plugins/common/src/p_player.c
    trunk/doomsday/plugins/common/src/p_start.c
    trunk/doomsday/plugins/common/src/p_switch.c
    trunk/doomsday/plugins/common/src/p_user.c
    trunk/doomsday/plugins/common/src/p_xgline.c
    trunk/doomsday/plugins/jdoom/include/sndidx.h
    trunk/doomsday/plugins/jdoom/src/d_items.c
    trunk/doomsday/plugins/jdoom/src/m_cheat.c
    trunk/doomsday/plugins/jdoom/src/p_enemy.c
    trunk/doomsday/plugins/jdoom/src/p_inter.c
    trunk/doomsday/plugins/jdoom/src/p_mobj.c
    trunk/doomsday/plugins/jdoom/src/p_pspr.c
    trunk/doomsday/plugins/jdoom/src/p_sound.c
    trunk/doomsday/plugins/jdoom/src/p_spec.c
    trunk/doomsday/plugins/jdoom/src/p_telept.c
    trunk/doomsday/plugins/jdoom/src/wi_stuff.c
    trunk/doomsday/plugins/jdoom64/include/sndidx.h
    trunk/doomsday/plugins/jdoom64/src/d_items.c
    trunk/doomsday/plugins/jdoom64/src/m_cheat.c
    trunk/doomsday/plugins/jdoom64/src/p_enemy.c
    trunk/doomsday/plugins/jdoom64/src/p_inter.c
    trunk/doomsday/plugins/jdoom64/src/p_mobj.c
    trunk/doomsday/plugins/jdoom64/src/p_pspr.c
    trunk/doomsday/plugins/jdoom64/src/p_sound.c
    trunk/doomsday/plugins/jdoom64/src/p_spec.c
    trunk/doomsday/plugins/jdoom64/src/p_telept.c
    trunk/doomsday/plugins/jdoom64/src/wi_stuff.c
    trunk/doomsday/plugins/jheretic/include/sounds.h
    trunk/doomsday/plugins/jheretic/src/in_lude.c
    trunk/doomsday/plugins/jheretic/src/m_cheat.c
    trunk/doomsday/plugins/jheretic/src/p_enemy.c
    trunk/doomsday/plugins/jheretic/src/p_inter.c
    trunk/doomsday/plugins/jheretic/src/p_mobj.c
    trunk/doomsday/plugins/jheretic/src/p_pspr.c
    trunk/doomsday/plugins/jheretic/src/p_spec.c
    trunk/doomsday/plugins/jheretic/src/p_telept.c
    trunk/doomsday/plugins/jheretic/src/st_stuff.c
    trunk/doomsday/plugins/jhexen/src/p_telept.c

Modified: trunk/doomsday/plugins/common/src/d_net.c
===================================================================
--- trunk/doomsday/plugins/common/src/d_net.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/d_net.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -567,14 +567,14 @@
 #elif __JSTRIFE__
     S_LocalSound(SFX_CHAT, NULL);
 #elif __JHERETIC__
-    S_LocalSound(sfx_chat, NULL);
+    S_LocalSound(SFX_CHAT, NULL);
 #else
 # if __JDOOM__
     if(gameMode == commercial)
-        S_LocalSound(sfx_radio, NULL);
+        S_LocalSound(SFX_RADIO, NULL);
     else
 # endif
-        S_LocalSound(sfx_tink, NULL);
+        S_LocalSound(SFX_TINK, NULL);
 #endif
 }
 

Modified: trunk/doomsday/plugins/common/src/d_netsv.c
===================================================================
--- trunk/doomsday/plugins/common/src/d_netsv.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/d_netsv.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -71,9 +71,9 @@
 #if __JHEXEN__ || __JSTRIFE__
 #  define SOUND_COUNTDOWN       SFX_PICKUP_KEY
 #elif __JDOOM__ || __JDOOM64__
-#  define SOUND_COUNTDOWN       sfx_getpow
+#  define SOUND_COUNTDOWN       SFX_GETPOW
 #elif __JHERETIC__
-#  define SOUND_COUNTDOWN       sfx_keyup
+#  define SOUND_COUNTDOWN       SFX_KEYUP
 #endif
 
 #define SOUND_VICTORY           SOUND_COUNTDOWN

Modified: trunk/doomsday/plugins/common/src/hu_menu.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_menu.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/hu_menu.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -306,29 +306,29 @@
 // Sounds played in the menu
 int menusnds[] = {
 #if __WOLFTC__
-    sfx_menubc,            // close menu
-    sfx_menubc,            // open menu
-    sfx_menubc,            // cancel
-    sfx_menumv,            // up/down
-    sfx_menumv,            // left/right
-    sfx_menusl,            // accept
-    sfx_menumv             // bad sound (eg can't autosave)
+    SFX_MENUBC,            // close menu
+    SFX_MENUBC,            // open menu
+    SFX_MENUBC,            // cancel
+    SFX_MENUMV,            // up/down
+    SFX_MENUMV,            // left/right
+    SFX_MENUSL,            // accept
+    SFX_MENUMV             // bad sound (eg can't autosave)
 #elif __JDOOM__ || __JDOOM64__
-    sfx_dorcls,            // close menu
-    sfx_swtchx,            // open menu
-    sfx_swtchn,            // cancel
-    sfx_pstop,             // up/down
-    sfx_stnmov,            // left/right
-    sfx_pistol,            // accept
-    sfx_oof                // bad sound (eg can't autosave)
+    SFX_DORCLS,            // close menu
+    SFX_SWTCHX,            // open menu
+    SFX_SWTCHN,            // cancel
+    SFX_PSTOP,             // up/down
+    SFX_STNMOV,            // left/right
+    SFX_PISTOL,            // accept
+    SFX_OOF                // bad sound (eg can't autosave)
 #elif __JHERETIC__
-    sfx_switch,
-    sfx_chat,
-    sfx_switch,
-    sfx_switch,
-    sfx_stnmov,
-    sfx_chat,
-    sfx_chat
+    SFX_SWITCH,
+    SFX_CHAT,
+    SFX_SWITCH,
+    SFX_SWITCH,
+    SFX_STNMOV,
+    SFX_CHAT,
+    SFX_CHAT
 #elif __JHEXEN__
     SFX_PLATFORM_STOP,
     SFX_DOOR_LIGHT_CLOSE,
@@ -932,7 +932,9 @@
     64, 30,
 #endif
     M_DrawHUDMenu,
-#if __JHEXEN__ || __JSTRIFE__
+#if __WOLFTC__
+    13, HUDItems,
+#elif __JHEXEN__ || __JSTRIFE__
     23, HUDItems,
 #elif __JHERETIC__
     25, HUDItems,
@@ -946,7 +948,9 @@
     cfg.menuColor2,
     NULL,
     LINEHEIGHT_A,
-#if __JHEXEN__ || __JSTRIFE__
+#if __WOLFTC__
+    0, 13
+#elif __JHEXEN__ || __JSTRIFE__
     0, 15        // 21
 #elif __JHERETIC__
     0, 15        // 23
@@ -3217,8 +3221,10 @@
     M_WriteMenuText(menu, idx++, yesno[cfg.hudShown[HUD_HEALTH]]);
     M_WriteMenuText(menu, idx++, yesno[cfg.hudShown[HUD_KEYS]]);
 # if __JDOOM__
+# if !__WOLFTC__
     M_WriteMenuText(menu, idx++, yesno[cfg.hudKeysCombine]);
 # endif
+# endif
     MN_DrawSlider(menu, idx++, 10, cfg.hudScale * 10 - 3 + .5f);
     MN_DrawColorBox(menu, idx++, cfg.hudColor[0], cfg.hudColor[1],
                     cfg.hudColor[2], menuAlpha);
@@ -3394,24 +3400,24 @@
 {
 #if __JDOOM__ || __JDOOM64__
     static int  quitsounds[8] = {
-        sfx_pldeth,
-        sfx_dmpain,
-        sfx_popain,
-        sfx_slop,
-        sfx_telept,
-        sfx_posit1,
-        sfx_posit3,
-        sfx_sgtatk
+        SFX_PLDETH,
+        SFX_DMPAIN,
+        SFX_POPAIN,
+        SFX_SLOP,
+        SFX_TELEPT,
+        SFX_POSIT1,
+        SFX_POSIT3,
+        SFX_SGTATK
     };
     static int  quitsounds2[8] = {
-        sfx_vilact,
-        sfx_getpow,
-        sfx_boscub,
-        sfx_slop,
-        sfx_skeswg,
-        sfx_kntdth,
-        sfx_bspact,
-        sfx_sgtatk
+        SFX_VILACT,
+        SFX_GETPOW,
+        SFX_BOSCUB,
+        SFX_SLOP,
+        SFX_SKESWG,
+        SFX_KNTDTH,
+        SFX_BSPACT,
+        SFX_SGTATK
     };
 #endif
 

Modified: trunk/doomsday/plugins/common/src/hu_msg.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_msg.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/hu_msg.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -723,16 +723,16 @@
 
 #if __WOLFTC__
     if(gameMode == commercial)
-        S_LocalSound(sfx_hudms1, 0);
+        S_LocalSound(SFX_HUDMS1, 0);
     else
-        S_LocalSound(sfx_hudms2, 0);
+        S_LocalSound(SFX_HUDMS2, 0);
 #elif __JDOOM__
     if(gameMode == commercial)
-        S_LocalSound(sfx_radio, 0);
+        S_LocalSound(SFX_RADIO, 0);
     else
-        S_LocalSound(sfx_tink, 0);
+        S_LocalSound(SFX_TINK, 0);
 #elif __JDOOM64__
-    S_LocalSound(sfx_radio, 0);
+    S_LocalSound(SFX_RADIO, 0);
 #endif
 }
 

Modified: trunk/doomsday/plugins/common/src/p_ceiling.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_ceiling.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_ceiling.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -65,19 +65,19 @@
 // MACROS ------------------------------------------------------------------
 
 // Sounds played by the ceilings when changing state or moving.
-// jHexen uses sound sequences, so it's are defined as 'sfx_None'.
+// jHexen uses sound sequences, so it's are defined as 'SFX_NONE'.
 #if __WOLFTC__
-# define SFX_CEILINGMOVE        (sfx_pltmov)
-# define SFX_CEILINGSTOP        (sfx_pltstp)
+# define SFX_CEILINGMOVE        (SFX_PLTMOV)
+# define SFX_CEILINGSTOP        (SFX_PLTSTP)
 #elif __JDOOM__
-# define SFX_CEILINGMOVE        (sfx_stnmov)
-# define SFX_CEILINGSTOP        (sfx_pstop)
+# define SFX_CEILINGMOVE        (SFX_STNMOV)
+# define SFX_CEILINGSTOP        (SFX_PSTOP)
 #elif __JDOOM64__
-# define SFX_CEILINGMOVE        (sfx_stnmov)
-# define SFX_CEILINGSTOP        (sfx_pstop)
+# define SFX_CEILINGMOVE        (SFX_STNMOV)
+# define SFX_CEILINGSTOP        (SFX_PSTOP)
 #elif __JHERETIC__
-# define SFX_CEILINGMOVE        (sfx_dormov)
-# define SFX_CEILINGSTOP        (sfx_none)
+# define SFX_CEILINGMOVE        (SFX_DORMOV)
+# define SFX_CEILINGSTOP        (SFX_NONE)
 #elif __JHEXEN__
 # define SFX_CEILINGMOVE        (SFX_NONE)
 # define SFX_CEILINGSTOP        (SFX_NONE)

Modified: trunk/doomsday/plugins/common/src/p_door.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_door.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_door.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -68,31 +68,31 @@
 // MACROS ------------------------------------------------------------------
 
 // Sounds played by the doors when changing state.
-// jHexen uses sound sequences, so it's are defined as 'sfx_None'.
+// jHexen uses sound sequences, so it's are defined as 'SFX_NONE'.
 #if __JDOOM64__
-# define SFX_DOORCLOSE         (sfx_dorcls)
-# define SFX_DOORBLAZECLOSE    (sfx_bdcls)
-# define SFX_DOOROPEN          (sfx_doropn)
-# define SFX_DOORBLAZEOPEN     (sfx_bdopn)
-# define SFX_DOORLOCKED        (sfx_oof)
+# define SFX_DOORCLOSE         (SFX_DORCLS)
+# define SFX_DOORBLAZECLOSE    (SFX_BDCLS)
+# define SFX_DOOROPEN          (SFX_DOROPN)
+# define SFX_DOORBLAZEOPEN     (SFX_BDOPN)
+# define SFX_DOORLOCKED        (SFX_OOF)
 #elif __WOLFTC__
-# define SFX_DOORCLOSE         (sfx_wlfdrc)
-# define SFX_DOORBLAZECLOSE    (sfx_wlfpwl)
-# define SFX_DOOROPEN          (sfx_wlfdro)
-# define SFX_DOORBLAZEOPEN     (sfx_wlfpwl)
-# define SFX_DOORLOCKED        (sfx_dorlck)
+# define SFX_DOORCLOSE         (SFX_WLFDRC)
+# define SFX_DOORBLAZECLOSE    (SFX_WLFPWL)
+# define SFX_DOOROPEN          (SFX_WLFDRO)
+# define SFX_DOORBLAZEOPEN     (SFX_WLFPWL)
+# define SFX_DOORLOCKED        (SFX_DORLCK)
 #elif __JDOOM__
-# define SFX_DOORCLOSE         (sfx_dorcls)
-# define SFX_DOORBLAZECLOSE    (sfx_bdcls)
-# define SFX_DOOROPEN          (sfx_doropn)
-# define SFX_DOORBLAZEOPEN     (sfx_bdopn)
-# define SFX_DOORLOCKED        (sfx_oof)
+# define SFX_DOORCLOSE         (SFX_DORCLS)
+# define SFX_DOORBLAZECLOSE    (SFX_BDCLS)
+# define SFX_DOOROPEN          (SFX_DOROPN)
+# define SFX_DOORBLAZEOPEN     (SFX_BDOPN)
+# define SFX_DOORLOCKED        (SFX_OOF)
 #elif __JHERETIC__
-# define SFX_DOORCLOSE         (sfx_doropn)
-# define SFX_DOORBLAZECLOSE    (sfx_None)
-# define SFX_DOOROPEN          (sfx_doropn)
-# define SFX_DOORBLAZEOPEN     (sfx_doropn)
-# define SFX_DOORLOCKED        (sfx_plroof)
+# define SFX_DOORCLOSE         (SFX_DOROPN)
+# define SFX_DOORBLAZECLOSE    (SFX_NONE)
+# define SFX_DOOROPEN          (SFX_DOROPN)
+# define SFX_DOORBLAZEOPEN     (SFX_DOROPN)
+# define SFX_DOORLOCKED        (SFX_PLROOF)
 #elif __JHEXEN__
 # define SFX_DOORCLOSE         (SFX_NONE)
 # define SFX_DOORBLAZECLOSE    (SFX_NONE)
@@ -242,7 +242,7 @@
         {
             // DOOMII BUG:
             // The switch bellow SHOULD(?) play the blazing open sound if
-            // the door type is blazing and not sfx_doropn.
+            // the door type is blazing and not SFX_DOROPN.
             switch(door->type)
             {
 #if __JDOOM__ || __JDOOM64__ || __WOLFTC__

Modified: trunk/doomsday/plugins/common/src/p_floor.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_floor.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_floor.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -68,11 +68,11 @@
 // MACROS ------------------------------------------------------------------
 
 #if __WOLFTC__
-# define SFX_FLOORMOVE          (sfx_pltstr)
+# define SFX_FLOORMOVE          (SFX_PLTSTR)
 #elif __JHERETIC__
-# define SFX_FLOORMOVE          (sfx_dormov)
+# define SFX_FLOORMOVE          (SFX_DORMOV)
 #else
-# define SFX_FLOORMOVE          (sfx_stnmov)
+# define SFX_FLOORMOVE          (SFX_STNMOV)
 #endif
 
 #if __JHEXEN__
@@ -390,12 +390,12 @@
         SN_StopSequence(P_GetPtrp(floor->sector, DMU_SOUND_ORIGIN));
 #else
 # if __WOLFTC__
-        S_SectorSound(floor->sector, SORG_FLOOR, sfx_pltstp);
+        S_SectorSound(floor->sector, SORG_FLOOR, SFX_PLTSTP);
 # else
 #   if __JHERETIC__
         if(floor->type == FT_RAISEBUILDSTEP)
 #   endif
-            S_SectorSound(floor->sector, SORG_FLOOR, sfx_pstop);
+            S_SectorSound(floor->sector, SORG_FLOOR, SFX_PSTOP);
 # endif
 #endif
 #if __JHEXEN__

Modified: trunk/doomsday/plugins/common/src/p_inventory.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_inventory.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_inventory.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -330,7 +330,7 @@
 
 # if __JHERETIC__
     if(play_sound)
-        S_ConsoleSound(sfx_artiuse, NULL, player - players);
+        S_ConsoleSound(SFX_ARTIUSE, NULL, player - players);
 # endif
 
     return success;
@@ -407,7 +407,7 @@
             else
             {   // Succeeded.
                 player->morphTics = 0;
-                S_StartSound(sfx_wpnup, player->plr->mo);
+                S_StartSound(SFX_WPNUP, player->plr->mo);
             }
         }
         else

Modified: trunk/doomsday/plugins/common/src/p_map.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_map.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_map.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -765,7 +765,7 @@
                 P_RipperBlood(tmThing);
             }
 #if __JHERETIC__
-            S_StartSound(sfx_ripslop, tmThing);
+            S_StartSound(SFX_RIPSLOP, tmThing);
 #endif
 #if __JDOOM__
             if(tmThing->damage == DDMAXINT) //// \kludge to support old save games.
@@ -1655,7 +1655,7 @@
     {
         // Make blaster big puff.
         mobj_t *mo = P_SpawnMobj3fv(MT_BLASTERPUFF2, pos);
-        S_StartSound(sfx_blshit, mo);
+        S_StartSound(SFX_BLSHIT, mo);
     }
     else
         P_SpawnPuff(pos[VX], pos[VY], pos[VZ]);
@@ -2510,7 +2510,7 @@
         //// \fixme kaiser - the def file is too fucked up..
         //// DJS - FIXME!
         P_MobjChangeState(thing, S_HEADCANDLES + 3);
-        S_StartSound(sfx_slop, thing);
+        S_StartSound(SFX_SLOP, thing);
 # elif __JDOOM__
         P_MobjChangeState(thing, S_GIBS);
 # endif

Modified: trunk/doomsday/plugins/common/src/p_plat.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_plat.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_plat.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -64,23 +64,23 @@
 // MACROS ------------------------------------------------------------------
 
 // Sounds played by the platforms when changing state or moving.
-// jHexen uses sound sequences, so it's are defined as 'sfx_None'.
+// jHexen uses sound sequences, so it's are defined as 'SFX_NONE'.
 #if __WOLFTC__
-# define SFX_PLATFORMSTART      (sfx_pltstr)
-# define SFX_PLATFORMMOVE       (sfx_pltmov)
-# define SFX_PLATFORMSTOP       (sfx_pltstp)
+# define SFX_PLATFORMSTART      (SFX_PLTSTR)
+# define SFX_PLATFORMMOVE       (SFX_PLTMOV)
+# define SFX_PLATFORMSTOP       (SFX_PLTSTP)
 #elif __JDOOM__
-# define SFX_PLATFORMSTART      (sfx_pstart)
-# define SFX_PLATFORMMOVE       (sfx_stnmov)
-# define SFX_PLATFORMSTOP       (sfx_pstop)
+# define SFX_PLATFORMSTART      (SFX_PSTART)
+# define SFX_PLATFORMMOVE       (SFX_STNMOV)
+# define SFX_PLATFORMSTOP       (SFX_PSTOP)
 #elif __JDOOM64__
-# define SFX_PLATFORMSTART      (sfx_pstart)
-# define SFX_PLATFORMMOVE       (sfx_stnmov)
-# define SFX_PLATFORMSTOP       (sfx_pstop)
+# define SFX_PLATFORMSTART      (SFX_PSTART)
+# define SFX_PLATFORMMOVE       (SFX_STNMOV)
+# define SFX_PLATFORMSTOP       (SFX_PSTOP)
 #elif __JHERETIC__
-# define SFX_PLATFORMSTART      (sfx_pstart)
-# define SFX_PLATFORMMOVE       (sfx_stnmov)
-# define SFX_PLATFORMSTOP       (sfx_pstop)
+# define SFX_PLATFORMSTART      (SFX_PSTART)
+# define SFX_PLATFORMMOVE       (SFX_STNMOV)
+# define SFX_PLATFORMSTOP       (SFX_PSTOP)
 #elif __JHEXEN__
 # define SFX_PLATFORMSTART      (SFX_NONE)
 # define SFX_PLATFORMMOVE       (SFX_NONE)

Modified: trunk/doomsday/plugins/common/src/p_player.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_player.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_player.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -867,13 +867,13 @@
     // jd64 > kaiser - another cheesy hack!!!
     if(mo->type == MT_DART || mo->type == MT_RDART)
     {
-        S_StartSound(sfx_skeswg, mo); // We got darts! spawn skeswg sound!
+        S_StartSound(SFX_SKESWG, mo); // We got darts! spawn skeswg sound!
     }
     else
     {
         mo->translucency = 255;
 
-        S_StartSound(sfx_itmbk, mo); // If not dart, then spawn itmbk sound
+        S_StartSound(SFX_ITMBK, mo); // If not dart, then spawn itmbk sound
         mo->intFlags = MIF_FADE;
         mo->translucency = 255;
     }

Modified: trunk/doomsday/plugins/common/src/p_start.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_start.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_start.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -64,7 +64,7 @@
 // MACROS ------------------------------------------------------------------
 
 #if __JDOOM__ || __JDOOM64__ || __JHERETIC__
-#  define TELEPORTSOUND     sfx_telept
+#  define TELEPORTSOUND     SFX_TELEPT
 #  define MAX_START_SPOTS   4 // Maximum number of different player starts.
 #else
 #  define TELEPORTSOUND     SFX_TELEPORT

Modified: trunk/doomsday/plugins/common/src/p_switch.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_switch.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_switch.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -363,9 +363,9 @@
 
 #if !__JHEXEN__
 # if __JHERETIC__ || __WOLFTC__
-    sound = sfx_switch;
+    sound = SFX_SWITCH;
 # else
-    sound = sfx_swtchn;
+    sound = SFX_SWTCHN;
 #endif
 
     // EXIT SWITCH?
@@ -373,9 +373,9 @@
     if(P_ToXLine(line)->special == 11)
     {
 #  if __WOLFTC__
-        sound = sfx_wfeswi;
+        sound = SFX_WFESWI;
 #  else
-        sound = sfx_swtchx;
+        sound = SFX_SWTCHX;
 #  endif
     }
 # endif

Modified: trunk/doomsday/plugins/common/src/p_user.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_user.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_user.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -1,4 +1,4 @@
-/**
+/**\file
  *\section License
  * License: GPL + jHeretic/jHexen Exception
  *
@@ -115,9 +115,9 @@
         {640, 1280, 320},
         24,
 # if __WOLFTC__
-        sfx_blockd
+        SFX_BLOCKD
 # else
-        sfx_noway
+        SFX_NOWAY
 # endif
     }
 };
@@ -135,7 +135,7 @@
         2048,
         {640, 1280, 320},
         24,
-        sfx_None
+        SFX_NONE
     },
     {   // Chicken
         S_CHICPLAY,
@@ -149,7 +149,7 @@
         2500,
         {640, 1280, 320},
         24,
-        sfx_None
+        SFX_NONE
     },
 };
 #elif __JHEXEN__
@@ -694,7 +694,7 @@
 
     if(P_Random() < 48)
     {   // Just noise.
-        S_StartSound(sfx_chicact, pmo);
+        S_StartSound(SFX_CHICACT, pmo);
     }
 # endif
 }
@@ -801,7 +801,7 @@
                       pos[VY] + 20 * FIX2FLT(finesine[angle]),
                       pos[VZ] + TELEFOGHEIGHT);
 # if __JHERETIC__
-    S_StartSound(sfx_telept, fog);
+    S_StartSound(SFX_TELEPT, fog);
 # else
     S_StartSound(SFX_TELEPORT, fog);
 # endif

Modified: trunk/doomsday/plugins/common/src/p_xgline.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_xgline.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/common/src/p_xgline.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -2156,12 +2156,12 @@
         "BLUE SKULL KEY", "YELLOW SKULL KEY", "RED SKULL KEY"
     };
     int    *keys = (int *) act->keys;
-    int     badsound = sfx_oof;
+    int     badsound = SFX_OOF;
 #elif __JHERETIC__
     int     num = 3;
     char   *keystr[] = { "YELLOW KEY", "GREEN KEY", "BLUE KEY" };
     boolean *keys = act->keys;
-    int     badsound = sfx_plroof;
+    int     badsound = SFX_PLROOF;
 #elif __JSTRIFE__
 //// \fixme FIXME!!!
     int     num = 3;

Modified: trunk/doomsday/plugins/jdoom/include/sndidx.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/sndidx.h	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/include/sndidx.h	2008-05-31 09:41:58 UTC (rev 5686)
@@ -4,7 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2007 Jaakko Keränen <jaakko.keranen@...>
- *\author Copyright © 2006-2007 Daniel Swanson <danij@...>
+ *\author Copyright © 2006-2008 Daniel Swanson <danij@...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,191 +33,191 @@
 
 // Sounds.
 typedef enum {
-    sfx_None,                      // 000
-    sfx_pistol,                    // 001
-    sfx_shotgn,                    // 002
-    sfx_sgcock,                    // 003
-    sfx_dshtgn,                    // 004
-    sfx_dbopn,                     // 005
-    sfx_dbcls,                     // 006
-    sfx_dbload,                    // 007
-    sfx_plasma,                    // 008
-    sfx_bfg,                       // 009
-    sfx_sawup,                     // 010
-    sfx_sawidl,                    // 011
-    sfx_sawful,                    // 012
-    sfx_sawhit,                    // 013
-    sfx_rlaunc,                    // 014
-    sfx_rxplod,                    // 015
-    sfx_firsht,                    // 016
-    sfx_firxpl,                    // 017
-    sfx_pstart,                    // 018
-    sfx_pstop,                     // 019
-    sfx_doropn,                    // 020
-    sfx_dorcls,                    // 021
-    sfx_stnmov,                    // 022
-    sfx_swtchn,                    // 023
-    sfx_swtchx,                    // 024
-    sfx_plpain,                    // 025
-    sfx_dmpain,                    // 026
-    sfx_popain,                    // 027
-    sfx_vipain,                    // 028
-    sfx_mnpain,                    // 029
-    sfx_pepain,                    // 030
-    sfx_slop,                      // 031
-    sfx_itemup,                    // 032
-    sfx_wpnup,                     // 033
-    sfx_oof,                       // 034
-    sfx_telept,                    // 035
-    sfx_posit1,                    // 036
-    sfx_posit2,                    // 037
-    sfx_posit3,                    // 038
-    sfx_bgsit1,                    // 039
-    sfx_bgsit2,                    // 040
-    sfx_sgtsit,                    // 041
-    sfx_cacsit,                    // 042
-    sfx_brssit,                    // 043
-    sfx_cybsit,                    // 044
-    sfx_spisit,                    // 045
-    sfx_bspsit,                    // 046
-    sfx_kntsit,                    // 047
-    sfx_vilsit,                    // 048
-    sfx_mansit,                    // 049
-    sfx_pesit,                     // 050
-    sfx_sklatk,                    // 051
-    sfx_sgtatk,                    // 052
-    sfx_skepch,                    // 053
-    sfx_vilatk,                    // 054
-    sfx_claw,                      // 055
-    sfx_skeswg,                    // 056
-    sfx_pldeth,                    // 057
-    sfx_pdiehi,                    // 058
-    sfx_podth1,                    // 059
-    sfx_podth2,                    // 060
-    sfx_podth3,                    // 061
-    sfx_bgdth1,                    // 062
-    sfx_bgdth2,                    // 063
-    sfx_sgtdth,                    // 064
-    sfx_cacdth,                    // 065
-    sfx_skldth,                    // 066
-    sfx_brsdth,                    // 067
-    sfx_cybdth,                    // 068
-    sfx_spidth,                    // 069
-    sfx_bspdth,                    // 070
-    sfx_vildth,                    // 071
-    sfx_kntdth,                    // 072
-    sfx_pedth,                     // 073
-    sfx_skedth,                    // 074
-    sfx_posact,                    // 075
-    sfx_bgact,                     // 076
-    sfx_dmact,                     // 077
-    sfx_bspact,                    // 078
-    sfx_bspwlk,                    // 079
-    sfx_vilact,                    // 080
-    sfx_noway,                     // 081
-    sfx_barexp,                    // 082
-    sfx_punch,                     // 083
-    sfx_hoof,                      // 084
-    sfx_metal,                     // 085
-    sfx_chgun,                     // 086
-    sfx_tink,                      // 087
-    sfx_bdopn,                     // 088
-    sfx_bdcls,                     // 089
-    sfx_itmbk,                     // 090
-    sfx_flame,                     // 091
-    sfx_flamst,                    // 092
-    sfx_getpow,                    // 093
-    sfx_bospit,                    // 094
-    sfx_boscub,                    // 095
-    sfx_bossit,                    // 096
-    sfx_bospn,                     // 097
-    sfx_bosdth,                    // 098
-    sfx_manatk,                    // 099
-    sfx_mandth,                    // 100
-    sfx_sssit,                     // 101
-    sfx_ssdth,                     // 102
-    sfx_keenpn,                    // 103
-    sfx_keendt,                    // 104
-    sfx_skeact,                    // 105
-    sfx_skesit,                    // 106
-    sfx_skeatk,                    // 107
-    sfx_radio,                     // 108
-    sfx_wsplash,                   // 109
-    sfx_nsplash,                   // 110
-    sfx_blurb,                     // 111
+    SFX_NONE,                      // 000
+    SFX_PISTOL,                    // 001
+    SFX_SHOTGN,                    // 002
+    SFX_SGCOCK,                    // 003
+    SFX_DSHTGN,                    // 004
+    SFX_DBOPN,                     // 005
+    SFX_DBCLS,                     // 006
+    SFX_DBLOAD,                    // 007
+    SFX_PLASMA,                    // 008
+    SFX_BFG,                       // 009
+    SFX_SAWUP,                     // 010
+    SFX_SAWIDL,                    // 011
+    SFX_SAWFUL,                    // 012
+    SFX_SAWHIT,                    // 013
+    SFX_RLAUNC,                    // 014
+    SFX_RXPLOD,                    // 015
+    SFX_FIRSHT,                    // 016
+    SFX_FIRXPL,                    // 017
+    SFX_PSTART,                    // 018
+    SFX_PSTOP,                     // 019
+    SFX_DOROPN,                    // 020
+    SFX_DORCLS,                    // 021
+    SFX_STNMOV,                    // 022
+    SFX_SWTCHN,                    // 023
+    SFX_SWTCHX,                    // 024
+    SFX_PLPAIN,                    // 025
+    SFX_DMPAIN,                    // 026
+    SFX_POPAIN,                    // 027
+    SFX_VIPAIN,                    // 028
+    SFX_MNPAIN,                    // 029
+    SFX_PEPAIN,                    // 030
+    SFX_SLOP,                      // 031
+    SFX_ITEMUP,                    // 032
+    SFX_WPNUP,                     // 033
+    SFX_OOF,                       // 034
+    SFX_TELEPT,                    // 035
+    SFX_POSIT1,                    // 036
+    SFX_POSIT2,                    // 037
+    SFX_POSIT3,                    // 038
+    SFX_BGSIT1,                    // 039
+    SFX_BGSIT2,                    // 040
+    SFX_SGTSIT,                    // 041
+    SFX_CACSIT,                    // 042
+    SFX_BRSSIT,                    // 043
+    SFX_CYBSIT,                    // 044
+    SFX_SPISIT,                    // 045
+    SFX_BSPSIT,                    // 046
+    SFX_KNTSIT,                    // 047
+    SFX_VILSIT,                    // 048
+    SFX_MANSIT,                    // 049
+    SFX_PESIT,                     // 050
+    SFX_SKLATK,                    // 051
+    SFX_SGTATK,                    // 052
+    SFX_SKEPCH,                    // 053
+    SFX_VILATK,                    // 054
+    SFX_CLAW,                      // 055
+    SFX_SKESWG,                    // 056
+    SFX_PLDETH,                    // 057
+    SFX_PDIEHI,                    // 058
+    SFX_PODTH1,                    // 059
+    SFX_PODTH2,                    // 060
+    SFX_PODTH3,                    // 061
+    SFX_BGDTH1,                    // 062
+    SFX_BGDTH2,                    // 063
+    SFX_SGTDTH,                    // 064
+    SFX_CACDTH,                    // 065
+    SFX_SKLDTH,                    // 066
+    SFX_BRSDTH,                    // 067
+    SFX_CYBDTH,                    // 068
+    SFX_SPIDTH,                    // 069
+    SFX_BSPDTH,                    // 070
+    SFX_VILDTH,                    // 071
+    SFX_KNTDTH,                    // 072
+    SFX_PEDTH,                     // 073
+    SFX_SKEDTH,                    // 074
+    SFX_POSACT,                    // 075
+    SFX_BGACT,                     // 076
+    SFX_DMACT,                     // 077
+    SFX_BSPACT,                    // 078
+    SFX_BSPWLK,                    // 079
+    SFX_VILACT,                    // 080
+    SFX_NOWAY,                     // 081
+    SFX_BAREXP,                    // 082
+    SFX_PUNCH,                     // 083
+    SFX_HOOF,                      // 084
+    SFX_METAL,                     // 085
+    SFX_CHGUN,                     // 086
+    SFX_TINK,                      // 087
+    SFX_BDOPN,                     // 088
+    SFX_BDCLS,                     // 089
+    SFX_ITMBK,                     // 090
+    SFX_FLAME,                     // 091
+    SFX_FLAMST,                    // 092
+    SFX_GETPOW,                    // 093
+    SFX_BOSPIT,                    // 094
+    SFX_BOSCUB,                    // 095
+    SFX_BOSSIT,                    // 096
+    SFX_BOSPN,                     // 097
+    SFX_BOSDTH,                    // 098
+    SFX_MANATK,                    // 099
+    SFX_MANDTH,                    // 100
+    SFX_SSSIT,                     // 101
+    SFX_SSDTH,                     // 102
+    SFX_KEENPN,                    // 103
+    SFX_KEENDT,                    // 104
+    SFX_SKEACT,                    // 105
+    SFX_SKESIT,                    // 106
+    SFX_SKEATK,                    // 107
+    SFX_RADIO,                     // 108
+    SFX_WSPLASH,                   // 109
+    SFX_NSPLASH,                   // 110
+    SFX_BLURB,                     // 111
     NUMSFX                         // 112
 } sfxenum_t;
 
 // Music.
 typedef enum {
-    mus_None,                      // 000
-    mus_e1m1,                      // 001
-    mus_e1m2,                      // 002
-    mus_e1m3,                      // 003
-    mus_e1m4,                      // 004
-    mus_e1m5,                      // 005
-    mus_e1m6,                      // 006
-    mus_e1m7,                      // 007
-    mus_e1m8,                      // 008
-    mus_e1m9,                      // 009
-    mus_e2m1,                      // 010
-    mus_e2m2,                      // 011
-    mus_e2m3,                      // 012
-    mus_e2m4,                      // 013
-    mus_e2m5,                      // 014
-    mus_e2m6,                      // 015
-    mus_e2m7,                      // 016
-    mus_e2m8,                      // 017
-    mus_e2m9,                      // 018
-    mus_e3m1,                      // 019
-    mus_e3m2,                      // 020
-    mus_e3m3,                      // 021
-    mus_e3m4,                      // 022
-    mus_e3m5,                      // 023
-    mus_e3m6,                      // 024
-    mus_e3m7,                      // 025
-    mus_e3m8,                      // 026
-    mus_e3m9,                      // 027
-    mus_inter,                     // 028
-    mus_intro,                     // 029
-    mus_bunny,                     // 030
-    mus_victor,                    // 031
-    mus_introa,                    // 032
-    mus_runnin,                    // 033
-    mus_stalks,                    // 034
-    mus_countd,                    // 035
-    mus_betwee,                    // 036
-    mus_doom,                      // 037
-    mus_the_da,                    // 038
-    mus_shawn,                     // 039
-    mus_ddtblu,                    // 040
-    mus_in_cit,                    // 041
-    mus_dead,                      // 042
-    mus_stlks2,                    // 043
-    mus_theda2,                    // 044
-    mus_doom2,                     // 045
-    mus_ddtbl2,                    // 046
-    mus_runni2,                    // 047
-    mus_dead2,                     // 048
-    mus_stlks3,                    // 049
-    mus_romero,                    // 050
-    mus_shawn2,                    // 051
-    mus_messag,                    // 052
-    mus_count2,                    // 053
-    mus_ddtbl3,                    // 054
-    mus_ampie,                     // 055
-    mus_theda3,                    // 056
-    mus_adrian,                    // 057
-    mus_messg2,                    // 058
-    mus_romer2,                    // 059
-    mus_tense,                     // 060
-    mus_shawn3,                    // 061
-    mus_openin,                    // 062
-    mus_evil,                      // 063
-    mus_ultima,                    // 064
-    mus_read_m,                    // 065
-    mus_dm2ttl,                    // 066
-    mus_dm2int,                    // 067
+    MUS_NONE,                      // 000
+    MUS_E1M1,                      // 001
+    MUS_E1M2,                      // 002
+    MUS_E1M3,                      // 003
+    MUS_E1M4,                      // 004
+    MUS_E1M5,                      // 005
+    MUS_E1M6,                      // 006
+    MUS_E1M7,                      // 007
+    MUS_E1M8,                      // 008
+    MUS_E1M9,                      // 009
+    MUS_E2M1,                      // 010
+    MUS_E2M2,                      // 011
+    MUS_E2M3,                      // 012
+    MUS_E2M4,                      // 013
+    MUS_E2M5,                      // 014
+    MUS_E2M6,                      // 015
+    MUS_E2M7,                      // 016
+    MUS_E2M8,                      // 017
+    MUS_E2M9,                      // 018
+    MUS_E3M1,                      // 019
+    MUS_E3M2,                      // 020
+    MUS_E3M3,                      // 021
+    MUS_E3M4,                      // 022
+    MUS_E3M5,                      // 023
+    MUS_E3M6,                      // 024
+    MUS_E3M7,                      // 025
+    MUS_E3M8,                      // 026
+    MUS_E3M9,                      // 027
+    MUS_INTER,                     // 028
+    MUS_INTRO,                     // 029
+    MUS_BUNNY,                     // 030
+    MUS_VICTOR,                    // 031
+    MUS_INTROA,                    // 032
+    MUS_RUNNIN,                    // 033
+    MUS_STALKS,                    // 034
+    MUS_COUNTD,                    // 035
+    MUS_BETWEE,                    // 036
+    MUS_DOOM,                      // 037
+    MUS_THE_DA,                    // 038
+    MUS_SHAWN,                     // 039
+    MUS_DDTBLU,                    // 040
+    MUS_IN_CIT,                    // 041
+    MUS_DEAD,                      // 042
+    MUS_STLKS2,                    // 043
+    MUS_THEDA2,                    // 044
+    MUS_DOOM2,                     // 045
+    MUS_DDTBL2,                    // 046
+    MUS_RUNNI2,                    // 047
+    MUS_DEAD2,                     // 048
+    MUS_STLKS3,                    // 049
+    MUS_ROMERO,                    // 050
+    MUS_SHAWN2,                    // 051
+    MUS_MESSAG,                    // 052
+    MUS_COUNT2,                    // 053
+    MUS_DDTBL3,                    // 054
+    MUS_AMPIE,                     // 055
+    MUS_THEDA3,                    // 056
+    MUS_ADRIAN,                    // 057
+    MUS_MESSG2,                    // 058
+    MUS_ROMER2,                    // 059
+    MUS_TENSE,                     // 060
+    MUS_SHAWN3,                    // 061
+    MUS_OPENIN,                    // 062
+    MUS_EVIL,                      // 063
+    MUS_ULTIMA,                    // 064
+    MUS_READ_M,                    // 065
+    MUS_DM2TTL,                    // 066
+    MUS_DM2INT,                    // 067
     NUMMUSIC                       // 068
 } musicenum_t;
 

Modified: trunk/doomsday/plugins/jdoom/src/d_items.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/d_items.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/d_items.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -161,10 +161,10 @@
      {0, 0, 0, 0}, // pershot: clip | shell | cell | misl
      true,         // autofire when raised if fire held
      S_SAWUP,
-     sfx_sawup,    // raise sound id
+     SFX_SAWUP,    // raise sound id
      S_SAWDOWN,
      S_SAW,
-     sfx_sawidl,   // ready sound
+     SFX_SAWIDL,   // ready sound
      S_SAW1,
      S_NULL
     }

Modified: trunk/doomsday/plugins/jdoom/src/m_cheat.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/m_cheat.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/m_cheat.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -411,7 +411,7 @@
     if(gameMode == commercial)
     {
         off = (buf[0] - '0') * 10 + buf[1] - '0';
-        musnum = mus_runnin + off - 1;
+        musnum = MUS_RUNNIN + off - 1;
         if(off < 1 || off > 35)
             P_SetMessage(plyr, STSTR_NOMUS, false);
         else
@@ -420,7 +420,7 @@
     else
     {
         off = (buf[0] - '1') * 9 + (buf[1] - '1');
-        musnum = mus_e1m1 + off;
+        musnum = MUS_E1M1 + off;
         if(off > 31)
             P_SetMessage(plyr, STSTR_NOMUS, false);
         else
@@ -582,7 +582,7 @@
 {
     if(G_GetGameState() != GS_LEVEL)
     {
-        S_LocalSound(sfx_oof, NULL);
+        S_LocalSound(SFX_OOF, NULL);
         Con_Printf("Can only suicide when in a game!\n");
         return true;
     }
@@ -879,7 +879,7 @@
 
     if(G_GetGameState() != GS_LEVEL)
     {
-        S_LocalSound(sfx_oof, NULL);
+        S_LocalSound(SFX_OOF, NULL);
         Con_Printf("Can only exit a level when in a game!\n");
         return true;
     }

Modified: trunk/doomsday/plugins/jdoom/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_enemy.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/p_enemy.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -689,15 +689,15 @@
 
         switch(actor->info->seeSound)
         {
-        case sfx_posit1:
-        case sfx_posit2:
-        case sfx_posit3:
-            sound = sfx_posit1 + P_Random() % 3;
+        case SFX_POSIT1:
+        case SFX_POSIT2:
+        case SFX_POSIT3:
+            sound = SFX_POSIT1 + P_Random() % 3;
             break;
 
-        case sfx_bgsit1:
-        case sfx_bgsit2:
-            sound = sfx_bgsit1 + P_Random() % 2;
+        case SFX_BGSIT1:
+        case SFX_BGSIT2:
+            sound = SFX_BGSIT1 + P_Random() % 2;
             break;
 
         default:
@@ -848,7 +848,7 @@
     angle = actor->angle;
     slope = P_AimLineAttack(actor, angle, MISSILERANGE);
 
-    S_StartSound(sfx_pistol, actor);
+    S_StartSound(SFX_PISTOL, actor);
     angle += (P_Random() - P_Random()) << 20;
     damage = ((P_Random() % 5) + 1) * 3;
     P_LineAttack(actor, angle, MISSILERANGE, slope, damage);
@@ -863,7 +863,7 @@
     if(!actor->target)
         return;
 
-    S_StartSound(sfx_shotgn, actor);
+    S_StartSound(SFX_SHOTGN, actor);
     A_FaceTarget(actor);
     bangle = actor->angle;
     slope = P_AimLineAttack(actor, bangle, MISSILERANGE);
@@ -885,7 +885,7 @@
     if(!actor->target)
         return;
 
-    S_StartSound(sfx_shotgn, actor);
+    S_StartSound(SFX_SHOTGN, actor);
     A_FaceTarget(actor);
     bangle = actor->angle;
     slope = P_AimLineAttack(actor, bangle, MISSILERANGE);
@@ -946,7 +946,7 @@
     A_FaceTarget(actor);
     if(checkMeleeRange(actor))
     {
-        S_StartSound(sfx_claw, actor);
+        S_StartSound(SFX_CLAW, actor);
         damage = (P_Random() % 8 + 1) * 3;
         P_DamageMobj(actor->target, actor, actor, damage);
         return;
@@ -1010,7 +1010,7 @@
 
     if(checkMeleeRange(actor))
     {
-        S_StartSound(sfx_claw, actor);
+        S_StartSound(SFX_CLAW, actor);
         damage = (P_Random() % 8 + 1) * 10;
         P_DamageMobj(actor->target, actor, actor, damage);
         return;
@@ -1116,7 +1116,7 @@
         return;
 
     A_FaceTarget(actor);
-    S_StartSound(sfx_skeswg, actor);
+    S_StartSound(SFX_SKESWG, actor);
 }
 
 void C_DECL A_SkelFist(mobj_t *actor)
@@ -1130,7 +1130,7 @@
     if(checkMeleeRange(actor))
     {
         damage = ((P_Random() % 10) + 1) * 6;
-        S_StartSound(sfx_skepch, actor);
+        S_StartSound(SFX_SKEPCH, actor);
         P_DamageMobj(actor->target, actor, actor, damage);
     }
 }
@@ -1227,7 +1227,7 @@
             actor->target = temp;
 
             P_MobjChangeState(actor, S_VILE_HEAL1);
-            S_StartSound(sfx_slop, corpseHit);
+            S_StartSound(SFX_SLOP, corpseHit);
             info = corpseHit->info;
 
             P_MobjChangeState(corpseHit, info->raiseState);
@@ -1256,18 +1256,18 @@
 
 void C_DECL A_VileStart(mobj_t *actor)
 {
-    S_StartSound(sfx_vilatk, actor);
+    S_StartSound(SFX_VILATK, actor);
 }
 
 void C_DECL A_StartFire(mobj_t *actor)
 {
-    S_StartSound(sfx_flamst, actor);
+    S_StartSound(SFX_FLAMST, actor);
     A_Fire(actor);
 }
 
 void C_DECL A_FireCrackle(mobj_t *actor)
 {
-    S_StartSound(sfx_flame, actor);
+    S_StartSound(SFX_FLAME, actor);
     A_Fire(actor);
 }
 
@@ -1329,7 +1329,7 @@
     if(!P_CheckSight(actor, actor->target))
         return;
 
-    S_StartSound(sfx_barexp, actor);
+    S_StartSound(SFX_BAREXP, actor);
     P_DamageMobj(actor->target, actor, actor, 20);
     actor->target->mom[MZ] = 1000 / actor->target->info->mass;
 
@@ -1348,7 +1348,7 @@
 void C_DECL A_FatRaise(mobj_t *actor)
 {
     A_FaceTarget(actor);
-    S_StartSound(sfx_manatk, actor);
+    S_StartSound(SFX_MANATK, actor);
 }
 
 /**
@@ -1558,15 +1558,15 @@
     case 0:
         return;
 
-    case sfx_podth1:
-    case sfx_podth2:
-    case sfx_podth3:
-        sound = sfx_podth1 + P_Random() % 3;
+    case SFX_PODTH1:
+    case SFX_PODTH2:
+    case SFX_PODTH3:
+        sound = SFX_PODTH1 + P_Random() % 3;
         break;
 
-    case sfx_bgdth1:
-    case sfx_bgdth2:
-        sound = sfx_bgdth1 + P_Random() % 2;
+    case SFX_BGDTH1:
+    case SFX_BGDTH2:
+        sound = SFX_BGDTH1 + P_Random() % 2;
         break;
 
     default:
@@ -1587,7 +1587,7 @@
 
 void C_DECL A_XScream(mobj_t* actor)
 {
-    S_StartSound(sfx_slop, actor);
+    S_StartSound(SFX_SLOP, actor);
 }
 
 void C_DECL A_Pain(mobj_t* actor)
@@ -1787,7 +1787,7 @@
      * \kludge Only play very loud sounds in map 8.
      * \todo: Implement a MAPINFO option for this.
      */
-    S_StartSound(sfx_hoof |
+    S_StartSound(SFX_HOOF |
                  (gameMode != commercial &&
                   gameMap == 8 ? DDSF_NO_ATTENUATION : 0), mo);
     A_Chase(mo);
@@ -1799,7 +1799,7 @@
      * \kludge Only play very loud sounds in map 8.
      * \todo: Implement a MAPINFO option for this.
      */
-    S_StartSound(sfx_metal |
+    S_StartSound(SFX_METAL |
                  (gameMode != commercial &&
                   gameMap == 8 ? DDSF_NO_ATTENUATION : 0), mo);
     A_Chase(mo);
@@ -1807,18 +1807,18 @@
 
 void C_DECL A_BabyMetal(mobj_t *mo)
 {
-    S_StartSound(sfx_bspwlk, mo);
+    S_StartSound(SFX_BSPWLK, mo);
     A_Chase(mo);
 }
 
 void C_DECL A_BrainAwake(mobj_t *mo)
 {
-    S_StartSound(sfx_bossit, NULL);
+    S_StartSound(SFX_BOSSIT, NULL);
 }
 
 void C_DECL A_BrainPain(mobj_t *mo)
 {
-    S_StartSound(sfx_bospn, NULL);
+    S_StartSound(SFX_BOSPN, NULL);
 }
 
 void C_DECL A_BrainScream(mobj_t *mo)
@@ -1842,7 +1842,7 @@
             th->tics = 1;
     }
 
-    S_StartSound(sfx_bosdth, NULL);
+    S_StartSound(SFX_BOSDTH, NULL);
 }
 
 void C_DECL A_BrainExplode(mobj_t *mo)
@@ -1894,7 +1894,7 @@
             ((targ->pos[VY] - mo->pos[VY]) / newmobj->mom[MY]) / newmobj->state->tics;
     }
 
-    S_StartSound(sfx_bospit, NULL);
+    S_StartSound(SFX_BOSPIT, NULL);
 }
 
 /**
@@ -1902,7 +1902,7 @@
  */
 void C_DECL A_SpawnSound(mobj_t *mo)
 {
-    S_StartSound(sfx_boscub, mo);
+    S_StartSound(SFX_BOSCUB, mo);
     A_SpawnFly(mo);
 }
 
@@ -1921,7 +1921,7 @@
 
     // First spawn teleport fog.
     fog = P_SpawnMobj3fv(MT_SPAWNFIRE, targ->pos);
-    S_StartSound(sfx_telept, fog);
+    S_StartSound(SFX_TELEPT, fog);
 
     // Randomly select monster to spawn.
     r = P_Random();
@@ -1964,12 +1964,12 @@
 
 void C_DECL A_PlayerScream(mobj_t *mo)
 {
-    int                 sound = sfx_pldeth; // Default death sound.
+    int                 sound = SFX_PLDETH; // Default death sound.
 
     if((gameMode == commercial) && (mo->health < -50))
     {
         // If the player dies less with less than -50% without gibbing.
-        sound = sfx_pdiehi;
+        sound = SFX_PDIEHI;
     }
 
     S_StartSound(sound, mo);

Modified: trunk/doomsday/plugins/jdoom/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_inter.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/p_inter.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -149,7 +149,7 @@
         if(player == &players[CONSOLEPLAYER])
             ST_HUDUnHide(HUE_ON_PICKUP_WEAPON);
 
-        S_ConsoleSound(sfx_wpnup, NULL, player - players);
+        S_ConsoleSound(SFX_WPNUP, NULL, player - players);
         return false;
     }
     else
@@ -372,7 +372,7 @@
         return;
     }
 
-    sound = sfx_itemup;
+    sound = SFX_ITEMUP;
     player = toucher->player;
 
     // Dead thing touching (an happen with a sliding player corpse).
@@ -430,7 +430,7 @@
         player->plr->mo->health = player->health;
         player->update |= PSF_HEALTH;
         P_SetMessage(player, GOTSUPER, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
 
         // Maybe unhide the HUD?
         if(player == &players[CONSOLEPLAYER])
@@ -445,7 +445,7 @@
         player->update |= PSF_HEALTH;
         P_GiveArmor(player, armorClass[1]);
         P_SetMessage(player, GOTMSPHERE, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
 
         // Maybe unhide the HUD?
         if(player == &players[CONSOLEPLAYER])
@@ -536,7 +536,7 @@
             return;
 
         P_SetMessage(player, GOTINVUL, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_PSTR:
@@ -549,7 +549,7 @@
             player->pendingWeapon = WT_FIRST;
             player->update |= PSF_PENDING_WEAPON | PSF_READY_WEAPON;
         }
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_PINS:
@@ -557,7 +557,7 @@
             return;
 
         P_SetMessage(player, GOTINVIS, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_SUIT:
@@ -565,7 +565,7 @@
             return;
 
         P_SetMessage(player, GOTSUIT, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_PMAP:
@@ -573,7 +573,7 @@
             return;
 
         P_SetMessage(player, GOTMAP, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_PVIS:
@@ -581,7 +581,7 @@
             return;
 
         P_SetMessage(player, GOTVISOR, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     // Ammo.
@@ -658,7 +658,7 @@
             return;
 
         P_SetMessage(player, GOTBFG9000, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_MGUN:
@@ -666,7 +666,7 @@
             return;
 
         P_SetMessage(player, GOTCHAINGUN, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_CSAW:
@@ -674,7 +674,7 @@
             return;
 
         P_SetMessage(player, GOTCHAINSAW, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_LAUN:
@@ -682,7 +682,7 @@
             return;
 
         P_SetMessage(player, GOTLAUNCHER, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_PLAS:
@@ -690,7 +690,7 @@
             return;
 
         P_SetMessage(player, GOTPLASMA, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_SHOT:
@@ -698,7 +698,7 @@
             return;
 
         P_SetMessage(player, GOTSHOTGUN, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_SGN2:
@@ -706,7 +706,7 @@
             return;
 
         P_SetMessage(player, GOTSHOTGUN2, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     default:

Modified: trunk/doomsday/plugins/jdoom/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_mobj.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/p_mobj.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -462,7 +462,7 @@
                 mo->dPlayer->viewHeightDelta = mo->mom[MZ] / 8;
 
                 if(mo->player->health > 0)
-                    S_StartSound(sfx_oof, mo);
+                    S_StartSound(SFX_OOF, mo);
             }
 
             mo->mom[MZ] = 0;
@@ -529,7 +529,7 @@
                  * after an archvile attack).
                  */
                 if(mo->player->health > 0)
-                    S_StartSound(sfx_oof, mo);
+                    S_StartSound(SFX_OOF, mo);
             }
 
             P_HitFloor(mo);
@@ -621,13 +621,13 @@
     // Spawn a teleport fog at old spot.
     mo = P_SpawnMobj3f(MT_TFOG, mobj->pos[VX], mobj->pos[VY],
                        P_GetFloatp(mobj->subsector, DMU_FLOOR_HEIGHT));
-    S_StartSound(sfx_telept, mo);
+    S_StartSound(SFX_TELEPT, mo);
 
     // Spawn a teleport fog at the new spot.
     ss = R_PointInSubsector(pos[VX], pos[VY]);
     mo = P_SpawnMobj3f(MT_TFOG, pos[VX], pos[VY],
                        P_GetFloatp(ss, DMU_FLOOR_HEIGHT));
-    S_StartSound(sfx_telept, mo);
+    S_StartSound(SFX_TELEPT, mo);
 
     if(mobj->info->flags & MF_SPAWNCEILING)
         pos[VZ] = ONCEILINGZ;
@@ -937,7 +937,7 @@
 
     // Spawn a teleport fog at the new spot.
     mo = P_SpawnMobj3fv(MT_IFOG, pos);
-    S_StartSound(sfx_itmbk, mo);
+    S_StartSound(SFX_ITMBK, mo);
 
     // Find which type to spawn.
     for(i = 0; i < Get(DD_NUMMOBJTYPES); ++i)

Modified: trunk/doomsday/plugins/jdoom/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_pspr.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/p_pspr.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -418,7 +418,7 @@
     // Turn to face target.
     if(lineTarget)
     {
-        S_StartSoundEx(sfx_punch, player->plr->mo);
+        S_StartSoundEx(SFX_PUNCH, player->plr->mo);
 
         player->plr->mo->angle =
             R_PointToAngle2(player->plr->mo->pos[VX],
@@ -448,11 +448,11 @@
 
     if(!lineTarget)
     {
-        S_StartSoundEx(sfx_sawful, player->plr->mo);
+        S_StartSoundEx(SFX_SAWFUL, player->plr->mo);
         return;
     }
 
-    S_StartSoundEx(sfx_sawhit, player->plr->mo);
+    S_StartSoundEx(SFX_SAWHIT, player->plr->mo);
 
     // Turn to face target.
     angle =
@@ -560,7 +560,7 @@
 
 void C_DECL A_FirePistol(player_t *player, pspdef_t *psp)
 {
-    S_StartSoundEx(sfx_pistol, player->plr->mo);
+    S_StartSoundEx(SFX_PISTOL, player->plr->mo);
 
     P_MobjChangeState(player->plr->mo,
                       PCLASS_INFO(player->class)->attackEndState);
@@ -582,7 +582,7 @@
 {
     int                 i;
 
-    S_StartSoundEx(sfx_shotgn, player->plr->mo);
+    S_StartSoundEx(SFX_SHOTGN, player->plr->mo);
     P_MobjChangeState(player->plr->mo,
                       PCLASS_INFO(player->class)->attackEndState);
 
@@ -607,7 +607,7 @@
     angle_t             angle;
     int                 damage;
 
-    S_StartSoundEx(sfx_dshtgn, player->plr->mo);
+    S_StartSoundEx(SFX_DSHTGN, player->plr->mo);
     P_MobjChangeState(player->plr->mo,
                       PCLASS_INFO(player->class)->attackEndState);
 
@@ -635,23 +635,23 @@
 
 void C_DECL A_OpenShotgun2(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_dbopn, player->plr->mo);
+    S_StartSound(SFX_DBOPN, player->plr->mo);
 }
 
 void C_DECL A_LoadShotgun2(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_dbload, player->plr->mo);
+    S_StartSound(SFX_DBLOAD, player->plr->mo);
 }
 
 void C_DECL A_CloseShotgun2(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_dbcls, player->plr->mo);
+    S_StartSound(SFX_DBCLS, player->plr->mo);
     A_ReFire(player, psp);
 }
 
 void C_DECL A_FireCGun(player_t *player, pspdef_t *psp)
 {
-    S_StartSoundEx(sfx_pistol, player->plr->mo);
+    S_StartSoundEx(SFX_PISTOL, player->plr->mo);
 
     P_MobjChangeState(player->plr->mo,
                       PCLASS_INFO(player->class)->attackEndState);
@@ -719,7 +719,7 @@
 
 void C_DECL A_BFGsound(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_bfg, player->plr->mo);
+    S_StartSound(SFX_BFG, player->plr->mo);
 }
 
 /**

Modified: trunk/doomsday/plugins/jdoom/src/p_sound.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_sound.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/p_sound.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -57,25 +57,25 @@
 
     if(gameMode == commercial)
     {
-        mnum = mus_runnin + map - 1;
+        mnum = MUS_RUNNIN + map - 1;
     }
     else
     {
         int                 spmus[] = {
             // Song - Who? - Where?
-            mus_e3m4,           // American     e4m1
-            mus_e3m2,           // Romero       e4m2
-            mus_e3m3,           // Shawn        e4m3
-            mus_e1m5,           // American     e4m4
-            mus_e2m7,           // Tim          e4m5
-            mus_e2m4,           // Romero       e4m6
-            mus_e2m6,           // J.Anderson   e4m7 CHIRON.WAD
-            mus_e2m5,           // Shawn        e4m8
-            mus_e1m9            // Tim          e4m9
+            MUS_E3M4,           // American     e4m1
+            MUS_E3M2,           // Romero       e4m2
+            MUS_E3M3,           // Shawn        e4m3
+            MUS_E1M5,           // American     e4m4
+            MUS_E2M7,           // Tim          e4m5
+            MUS_E2M4,           // Romero       e4m6
+            MUS_E2M6,           // J.Anderson   e4m7 CHIRON.WAD
+            MUS_E2M5,           // Shawn        e4m8
+            MUS_E1M9            // Tim          e4m9
         };
 
         if(episode < 4)
-            mnum = mus_e1m1 + (episode - 1) * 9 + map - 1;
+            mnum = MUS_E1M1 + (episode - 1) * 9 + map - 1;
         else
             mnum = spmus[map - 1];
     }

Modified: trunk/doomsday/plugins/jdoom/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_spec.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/p_spec.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -851,7 +851,7 @@
         if(cfg.secretMsg)
         {
             P_SetMessage(player, "You've found a secret area!", false);
-            S_ConsoleSound(sfx_getpow, 0, player - players);
+            S_ConsoleSound(SFX_GETPOW, 0, player - players);
         }
         break;
 
@@ -948,7 +948,7 @@
                               (int) button->section);
                 }
 
-                S_StartSound(sfx_swtchn,
+                S_StartSound(SFX_SWTCHN,
                              P_GetPtrp(frontsector, DMU_SOUND_ORIGIN));
 
                 button->line = NULL;
@@ -1196,7 +1196,7 @@
         // Prevent 'zombie players' from exiting levels.
         if(mo->player && mo->player->health <= 0 && !cfg.zombiesCanExit)
         {
-            S_StartSound(sfx_noway, mo);
+            S_StartSound(SFX_NOWAY, mo);
             return false;
         }
 
@@ -1278,7 +1278,7 @@
         // Prevent 'zombie players' from exiting levels.
         if(mo->player && mo->player->health <= 0 && !cfg.zombiesCanExit)
         {
-            S_StartSound(sfx_noway, mo);
+            S_StartSound(SFX_NOWAY, mo);
             return false;
         }
 

Modified: trunk/doomsday/plugins/jdoom/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_telept.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/p_telept.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -148,7 +148,7 @@
         {
             // Spawn teleport fog at source and destination.
             fog = P_SpawnMobj3fv(MT_TFOG, oldPos);
-            S_StartSound(sfx_telept, fog);
+            S_StartSound(SFX_TELEPT, fog);
 
             an = dest->angle >> ANGLETOFINESHIFT;
             fog = P_SpawnMobj3f(MT_TFOG,
@@ -157,7 +157,7 @@
                                 mo->pos[VZ]);
 
             // Emit sound, where?
-            S_StartSound(sfx_telept, fog);
+            S_StartSound(SFX_TELEPT, fog);
         }
 
         mo->angle = dest->angle;

Modified: trunk/doomsday/plugins/jdoom/src/wi_stuff.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/wi_stuff.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom/src/wi_stuff.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -757,14 +757,14 @@
             dmTotals[i] = WI_fragSum(i);
         }
 
-        S_LocalSound(sfx_barexp, 0);
+        S_LocalSound(SFX_BAREXP, 0);
         dmState = 4;
     }
 
     if(dmState == 2)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         stillTicking = false;
         for(i = 0; i < NUM_TEAMS; ++i)
@@ -799,7 +799,7 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             dmState++;
         }
     }
@@ -807,7 +807,7 @@
     {
         if(accelerateStage)
         {
-            S_LocalSound(sfx_slop, 0);
+            S_LocalSound(SFX_SLOP, 0);
             if(gameMode == commercial)
                 WI_initNoState();
             else
@@ -965,14 +965,14 @@
                 cntFrags[i] = teamInfo[i].totalFrags;
         }
 
-        S_LocalSound(sfx_barexp, 0);
+        S_LocalSound(SFX_BAREXP, 0);
         ngState = 10;
     }
 
     if(ngState == 2)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
         stillTicking = false;
 
         for(i = 0; i < NUM_TEAMS; ++i)
@@ -987,14 +987,14 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             ngState++;
         }
     }
     else if(ngState == 4)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
         stillTicking = false;
 
         for(i = 0; i < NUM_TEAMS; ++i)
@@ -1008,14 +1008,14 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             ngState++;
         }
     }
     else if(ngState == 6)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         stillTicking = false;
 
@@ -1031,14 +1031,14 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             ngState += 1 + 2 * !doFrags;
         }
     }
     else if(ngState == 8)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         stillTicking = false;
 
@@ -1054,7 +1054,7 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_pldeth, 0);
+            S_LocalSound(SFX_PLDETH, 0);
             ngState++;
         }
     }
@@ -1062,7 +1062,7 @@
     {
         if(accelerateStage)
         {
-            S_LocalSound(sfx_sgcock, 0);
+            S_LocalSound(SFX_SGCOCK, 0);
             if(gameMode == commercial)
                 WI_initNoState();
             else
@@ -1172,7 +1172,7 @@
         if(wbs->parTime != -1)
             cntPar = wbs->parTime / TICRATE;
 
-        S_LocalSound(sfx_barexp, 0);
+        S_LocalSound(SFX_BAREXP, 0);
         spState = 10;
     }
 
@@ -1181,12 +1181,12 @@
         cntKills[0] += 2;
 
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         if(cntKills[0] >= (plrs[me].kills * 100) / wbs->maxKills)
         {
             cntKills[0] = (plrs[me].kills * 100) / wbs->maxKills;
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             spState++;
         }
     }
@@ -1195,12 +1195,12 @@
         cntItems[0] += 2;
 
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         if(cntItems[0] >= (plrs[me].items * 100) / wbs->maxItems)
         {
             cntItems[0] = (plrs[me].items * 100) / wbs->maxItems;
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             spState++;
         }
     }
@@ -1209,19 +1209,19 @@
         cntSecret[0] += 2;
 
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         if(cntSecret[0] >= (plrs[me].secret * 100) / wbs->maxSecret)
         {
             cntSecret[0] = (plrs[me].secret * 100) / wbs->maxSecret;
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             spState++;
         }
     }
     else if(spState == 8)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         cntTime += 3;
 
@@ -1238,7 +1238,7 @@
 
                 if(cntTime >= plrs[me].time / TICRATE)
                 {
-                    S_LocalSound(sfx_barexp, 0);
+                    S_LocalSound(SFX_BAREXP, 0);
                     spState++;
                 }
             }
@@ -1250,7 +1250,7 @@
     {
         if(accelerateStage)
         {
-            S_LocalSound(sfx_sgcock, 0);
+            S_LocalSound(SFX_SGCOCK, 0);
 
             if(gameMode == commercial)
                 WI_initNoState();
@@ -1352,9 +1352,9 @@
     {
         // Intermission music.
         if(gameMode == commercial)
-            S_StartMusicNum(mus_dm2int, true);
+            S_StartMusicNum(MUS_DM2INT, true);
         else
-            S_StartMusicNum(mus_inter, true);
+            S_StartMusicNum(MUS_INTER, true);
     }
 
     WI_checkForAccelerate();

Modified: trunk/doomsday/plugins/jdoom64/include/sndidx.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/sndidx.h	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/include/sndidx.h	2008-05-31 09:41:58 UTC (rev 5686)
@@ -4,7 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2007 Jaakko Keränen <jaakko.keranen@...>
- *\author Copyright © 2006 Daniel Swanson <danij@...>
+ *\author Copyright © 2006-2008 Daniel Swanson <danij@...>
  *\author Copyright © 2003-2005 Samuel Villarreal <svkaiser@...>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,159 +32,159 @@
 
 // Sounds.
 typedef enum {
-    sfx_None,                      // 000
-    sfx_pistol,                    // 001
-    sfx_shotgn,                    // 002
-    sfx_sgcock,                    // 003
-    sfx_dshtgn,                    // 004
-    sfx_dbopn,                     // 005
-    sfx_dbcls,                     // 006
-    sfx_dbload,                    // 007
-    sfx_plasma,                    // 008
-    sfx_bfg,                       // 009
-    sfx_sawup,                     // 010
-    sfx_sawidl,                    // 011
-    sfx_sawful,                    // 012
-    sfx_sawhit,                    // 013
-    sfx_rlaunc,                    // 014
-    sfx_rxplod,                    // 015
-    sfx_firsht,                    // 016
-    sfx_firxpl,                    // 017
-    sfx_pstart,                    // 018
-    sfx_pstop,                     // 019
-    sfx_doropn,                    // 020
-    sfx_dorcls,                    // 021
-    sfx_stnmov,                    // 022
-    sfx_swtchn,                    // 023
-    sfx_swtchx,                    // 024
-    sfx_plpain,                    // 025
-    sfx_dmpain,                    // 026
-    sfx_popain,                    // 027
-    sfx_vipain,                    // 028
-    sfx_mnpain,                    // 029
-    sfx_pepain,                    // 030
-    sfx_slop,                      // 031
-    sfx_itemup,                    // 032
-    sfx_wpnup,                     // 033
-    sfx_oof,                       // 034
-    sfx_telept,                    // 035
-    sfx_posit1,                    // 036
-    sfx_posit2,                    // 037
-    sfx_posit3,                    // 038
-    sfx_bgsit1,                    // 039
-    sfx_bgsit2,                    // 040
-    sfx_sgtsit,                    // 041
-    sfx_cacsit,                    // 042
-    sfx_brssit,                    // 043
-    sfx_cybsit,                    // 044
-    sfx_spisit,                    // 045
-    sfx_bspsit,                    // 046
-    sfx_kntsit,                    // 047
-    sfx_vilsit,                    // 048
-    sfx_mansit,                    // 049
-    sfx_pesit,                     // 050
-    sfx_sklatk,                    // 051
-    sfx_sgtatk,                    // 052
-    sfx_skepch,                    // 053
-    sfx_vilatk,                    // 054
-    sfx_claw,                      // 055
-    sfx_skeswg,                    // 056
-    sfx_pldeth,                    // 057
-    sfx_pdiehi,                    // 058
-    sfx_podth1,                    // 059
-    sfx_podth2,                    // 060
-    sfx_podth3,                    // 061
-    sfx_bgdth1,                    // 062
-    sfx_bgdth2,                    // 063
-    sfx_sgtdth,                    // 064
-    sfx_cacdth,                    // 065
-    sfx_skldth,                    // 066
-    sfx_brsdth,                    // 067
-    sfx_cybdth,                    // 068
-    sfx_spidth,                    // 069
-    sfx_bspdth,                    // 070
-    sfx_vildth,                    // 071
-    sfx_kntdth,                    // 072
-    sfx_pedth,                     // 073
-    sfx_skedth,                    // 074
-    sfx_posact,                    // 075
-    sfx_bgact,                     // 076
-    sfx_dmact,                     // 077
-    sfx_bspact,                    // 078
-    sfx_bspwlk,                    // 079
-    sfx_vilact,                    // 080
-    sfx_noway,                     // 081
-    sfx_barexp,                    // 082
-    sfx_punch,                     // 083
-    sfx_hoof,                      // 084
-    sfx_metal,                     // 085
-    sfx_chgun,                     // 086
-    sfx_tink,                      // 087
-    sfx_bdopn,                     // 088
-    sfx_bdcls,                     // 089
-    sfx_itmbk,                     // 090
-    sfx_flame,                     // 091
-    sfx_flamst,                    // 092
-    sfx_getpow,                    // 093
-    sfx_bospit,                    // 094
-    sfx_boscub,                    // 095
-    sfx_bossit,                    // 096
-    sfx_bospn,                     // 097
-    sfx_bosdth,                    // 098
-    sfx_manatk,                    // 099
-    sfx_mandth,                    // 100
-    sfx_sssit,                     // 101
-    sfx_ssdth,                     // 102
-    sfx_keenpn,                    // 103
-    sfx_keendt,                    // 104
-    sfx_skeact,                    // 105
-    sfx_skesit,                    // 106
-    sfx_skeatk,                    // 107
-    sfx_radio,                     // 108
-    //sfx_wsplash, // jd64
-    //sfx_nsplash, // jd64
-    //sfx_blurb, // jd64
+    SFX_NONE,                      // 000
+    SFX_PISTOL,                    // 001
+    SFX_SHOTGN,                    // 002
+    SFX_SGCOCK,                    // 003
+    SFX_DSHTGN,                    // 004
+    SFX_DBOPN,                     // 005
+    SFX_DBCLS,                     // 006
+    SFX_DBLOAD,                    // 007
+    SFX_PLASMA,                    // 008
+    SFX_BFG,                       // 009
+    SFX_SAWUP,                     // 010
+    SFX_SAWIDL,                    // 011
+    SFX_SAWFUL,                    // 012
+    SFX_SAWHIT,                    // 013
+    SFX_RLAUNC,                    // 014
+    SFX_RXPLOD,                    // 015
+    SFX_FIRSHT,                    // 016
+    SFX_FIRXPL,                    // 017
+    SFX_PSTART,                    // 018
+    SFX_PSTOP,                     // 019
+    SFX_DOROPN,                    // 020
+    SFX_DORCLS,                    // 021
+    SFX_STNMOV,                    // 022
+    SFX_SWTCHN,                    // 023
+    SFX_SWTCHX,                    // 024
+    SFX_PLPAIN,                    // 025
+    SFX_DMPAIN,                    // 026
+    SFX_POPAIN,                    // 027
+    SFX_VIPAIN,                    // 028
+    SFX_MNPAIN,                    // 029
+    SFX_PEPAIN,                    // 030
+    SFX_SLOP,                      // 031
+    SFX_ITEMUP,                    // 032
+    SFX_WPNUP,                     // 033
+    SFX_OOF,                       // 034
+    SFX_TELEPT,                    // 035
+    SFX_POSIT1,                    // 036
+    SFX_POSIT2,                    // 037
+    SFX_POSIT3,                    // 038
+    SFX_BGSIT1,                    // 039
+    SFX_BGSIT2,                    // 040
+    SFX_SGTSIT,                    // 041
+    SFX_CACSIT,                    // 042
+    SFX_BRSSIT,                    // 043
+    SFX_CYBSIT,                    // 044
+    SFX_SPISIT,                    // 045
+    SFX_BSPSIT,                    // 046
+    SFX_KNTSIT,                    // 047
+    SFX_VILSIT,                    // 048
+    SFX_MANSIT,                    // 049
+    SFX_PESIT,                     // 050
+    SFX_SKLATK,                    // 051
+    SFX_SGTATK,                    // 052
+    SFX_SKEPCH,                    // 053
+    SFX_VILATK,                    // 054
+    SFX_CLAW,                      // 055
+    SFX_SKESWG,                    // 056
+    SFX_PLDETH,                    // 057
+    SFX_PDIEHI,                    // 058
+    SFX_PODTH1,                    // 059
+    SFX_PODTH2,                    // 060
+    SFX_PODTH3,                    // 061
+    SFX_BGDTH1,                    // 062
+    SFX_BGDTH2,                    // 063
+    SFX_SGTDTH,                    // 064
+    SFX_CACDTH,                    // 065
+    SFX_SKLDTH,                    // 066
+    SFX_BRSDTH,                    // 067
+    SFX_CYBDTH,                    // 068
+    SFX_SPIDTH,                    // 069
+    SFX_BSPDTH,                    // 070
+    SFX_VILDTH,                    // 071
+    SFX_KNTDTH,                    // 072
+    SFX_PEDTH,                     // 073
+    SFX_SKEDTH,                    // 074
+    SFX_POSACT,                    // 075
+    SFX_BGACT,                     // 076
+    SFX_DMACT,                     // 077
+    SFX_BSPACT,                    // 078
+    SFX_BSPWLK,                    // 079
+    SFX_VILACT,                    // 080
+    SFX_NOWAY,                     // 081
+    SFX_BAREXP,                    // 082
+    SFX_PUNCH,                     // 083
+    SFX_HOOF,                      // 084
+    SFX_MEAL,                     // 085
+    SFX_CHGUN,                     // 086
+    SFX_TINK,                      // 087
+    SFX_BDOPN,                     // 088
+    SFX_BDCLS,                     // 089
+    SFX_ITMBK,                     // 090
+    SFX_FLAME,                     // 091
+    SFX_FLAMST,                    // 092
+    SFX_GETPOW,                    // 093
+    SFX_BOSPIT,                    // 094
+    SFX_BOSCUB,                    // 095
+    SFX_BOSSIT,                    // 096
+    SFX_BOSPN,                     // 097
+    SFX_BOSDTH,                    // 098
+    SFX_MANATK,                    // 099
+    SFX_MANDTH,                    // 100
+    SFX_SSSIT,                     // 101
+    SFX_SSDTH,                     // 102
+    SFX_KEENPN,                    // 103
+    SFX_KEENDT,                    // 104
+    SFX_SKEACT,                    // 105
+    SFX_SKESIT,                    // 106
+    SFX_SKEATK,                    // 107
+    SFX_RADIO,                     // 108
+    //SFX_WSPLASH, // jd64
+    //SFX_NSPLASH, // jd64
+    //SFX_BLURB, // jd64
     // jd64 >
-    sfx_psidl,
-    sfx_laser,
-    sfx_mthatk,
-    sfx_mthsit,
-    sfx_mthpai,
-    sfx_mthact,
-    sfx_mthdth,
-    sfx_stlkst,
-    sfx_stlkpn,
-    sfx_stlktp,
-    sfx_htime,
-    // < d64tc
+    SFX_PSIDL,
+    SFX_LASER,
+    SFX_MTHATK,
+    SFX_MTHSIT,
+    SFX_MTHPAI,
+    SFX_MTHACT,
+    SFX_MTHDTH,
+    SFX_STLKST,
+    SFX_STLKPN,
+    SFX_STLKTP,
+    SFX_HTIME,
+    // < D64TC
     NUMSFX
 } sfxenum_t;
 
 // Music.
 typedef enum {
-    mus_None,                      // 000
-    mus_runnin,                    // 033
-    mus_stalks,                    // 034
-    mus_countd,                    // 035
-    mus_betwee,                    // 036
-    mus_doom,                      // 037
-    mus_the_da,                    // 038
-    mus_ddtblu,                    // 040
-    mus_dead,                      // 042
-    mus_stlks2,                    // 043
-    mus_theda2,                    // 044
-    mus_doom2,                     // 045
-    mus_ddtbl2,                    // 046
-    mus_runni2,                    // 047
-    mus_stlks3,                    // 049
-    mus_shawn2,                    // 051
-    mus_count2,                    // 053
-    mus_ddtbl3,                    // 054
-    mus_ampie,                     // 055
-    mus_evil,                      // 063
-    mus_read_m,                    // 065
-    mus_dm2ttl,                    // 066
-    mus_dm2int,                    // 067
+    MUS_NONE,                      // 000
+    MUS_RUNNIN,                    // 033
+    MUS_STALKS,                    // 034
+    MUS_COUNTD,                    // 035
+    MUS_BETWEE,                    // 036
+    MUS_DOOM,                      // 037
+    MUS_THE_DA,                    // 038
+    MUS_DDTBLU,                    // 040
+    MUS_DEAD,                      // 042
+    MUS_STLKS2,                    // 043
+    MUS_THEDA2,                    // 044
+    MUS_DOOM2,                     // 045
+    MUS_DDTBL2,                    // 046
+    MUS_RUNNI2,                    // 047
+    MUS_STLKS3,                    // 049
+    MUS_SHAWN2,                    // 051
+    MUS_COUNT2,                    // 053
+    MUS_DDTBL3,                    // 054
+    MUS_AMPIE,                     // 055
+    MUS_EVIL,                      // 063
+    MUS_READ_M,                    // 065
+    MUS_DM2TTL,                    // 066
+    MUS_DM2INT,                    // 067
     NUMMUSIC                       // 068
 } musicenum_t;
 

Modified: trunk/doomsday/plugins/jdoom64/src/d_items.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/d_items.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/d_items.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -164,10 +164,10 @@
      {0, 0, 0, 0}, // pershot: clip | shell | cell | misl
      true,         // autofire when raised if fire held
      S_SAWUP,
-     sfx_sawup,    // raise sound id
+     SFX_SAWUP,    // raise sound id
      S_SAWDOWN,
      S_SAW,
-     sfx_sawidl,   // ready sound
+     SFX_SAWIDL,   // ready sound
      S_SAW1,
      S_NULL
     }

Modified: trunk/doomsday/plugins/jdoom64/src/m_cheat.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/m_cheat.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/m_cheat.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -435,7 +435,7 @@
     int                 off, musnum;
 
     off = (buf[0] - '0') * 10 + buf[1] - '0';
-    musnum = mus_runnin + off - 1;
+    musnum = MUS_RUNNIN + off - 1;
     if(off < 1 || off > 35)
         P_SetMessage(plyr, STSTR_NOMUS, false);
     else
@@ -618,7 +618,7 @@
 {
     if(G_GetGameState() != GS_LEVEL)
     {
-        S_LocalSound(sfx_oof, NULL);
+        S_LocalSound(SFX_OOF, NULL);
         Con_Printf("Can only suicide when in a game!\n");
         return true;
     }
@@ -896,7 +896,7 @@
 
     if(G_GetGameState() != GS_LEVEL)
     {
-        S_LocalSound(sfx_oof, NULL);
+        S_LocalSound(SFX_OOF, NULL);
         Con_Printf("Can only exit a level when in a game!\n");
         return true;
     }

Modified: trunk/doomsday/plugins/jdoom64/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_enemy.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/p_enemy.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -998,15 +998,15 @@
 
         switch(actor->info->seeSound)
         {
-        case sfx_posit1:
-        case sfx_posit2:
-        case sfx_posit3:
-            sound = sfx_posit1 + P_Random() % 3;
+        case SFX_POSIT1:
+        case SFX_POSIT2:
+        case SFX_POSIT3:
+            sound = SFX_POSIT1 + P_Random() % 3;
             break;
 
-        case sfx_bgsit1:
-        case sfx_bgsit2:
-            sound = sfx_bgsit1 + P_Random() % 2;
+        case SFX_BGSIT1:
+        case SFX_BGSIT2:
+            sound = SFX_BGSIT1 + P_Random() % 2;
             break;
 
         default:
@@ -1169,7 +1169,7 @@
     angle = actor->angle;
     slope = P_AimLineAttack(actor, angle, MISSILERANGE);
 
-    S_StartSound(sfx_pistol, actor);
+    S_StartSound(SFX_PISTOL, actor);
     angle += (P_Random() - P_Random()) << 20;
     damage = ((P_Random() % 5) + 1) * 3;
     P_LineAttack(actor, angle, MISSILERANGE, slope, damage);
@@ -1184,7 +1184,7 @@
     if(!actor->target)
         return;
 
-    S_StartSound(sfx_shotgn, actor);
+    S_StartSound(SFX_SHOTGN, actor);
     A_FaceTarget(actor);
     bangle = actor->angle;
     slope = P_AimLineAttack(actor, bangle, MISSILERANGE);
@@ -1222,7 +1222,7 @@
     if(!actor->target)
         return;
 
-    S_StartSound(sfx_pistol, actor);
+    S_StartSound(SFX_PISTOL, actor);
     A_FaceTarget(actor);
     bangle = actor->angle;
     slope = P_AimLineAttack(actor, bangle, MISSILERANGE);
@@ -1373,7 +1373,7 @@
     A_FaceTarget(actor);
     if(checkMeleeRange(actor))
     {
-        S_StartSound(sfx_claw, actor);
+        S_StartSound(SFX_CLAW, actor);
         damage = (P_Random() % 8 + 1) * 3;
         P_DamageMobj(actor->target, actor, actor, damage);
         return;
@@ -1406,7 +1406,7 @@
         return;
 
     A_FaceTarget(actor);
-    S_StartSound(sfx_mthatk, actor);
+    S_StartSound(SFX_MTHATK, actor);
 /*
     mo = P_SpawnMissile(MT_FIREEND, actor, actor->target);
 
@@ -1604,7 +1604,7 @@
 
     if(checkMeleeRange(actor))
     {
-        S_StartSound(sfx_claw, actor);
+        S_StartSound(SFX_CLAW, actor);
         damage = (P_Random() % 8 + 1) * 10;
         P_DamageMobj(actor->target, actor, actor, damage);
         return;
@@ -1626,7 +1626,7 @@
 
     if(checkMeleeRange(actor))
     {
-        S_StartSound(sfx_claw, actor);
+        S_StartSound(SFX_CLAW, actor);
         damage = (P_Random() % 8 + 1) * 10;
         P_DamageMobj(actor->target, actor, actor, damage);
         return;
@@ -1654,7 +1654,7 @@
             actor->flags |= MF_SHOOTABLE;
 
             P_SpawnMobj3fv(MT_HFOG, actor->pos);
-            S_StartSound(sfx_stlktp, actor);
+            S_StartSound(SFX_STLKTP, actor);
             return;
         }
 
@@ -1665,7 +1665,7 @@
         {
             P_SpawnMobj3fv(MT_HFOG, actor->pos);
 
-            S_StartSound(sfx_stlktp, actor);
+            S_StartSound(SFX_STLKTP, actor);
             P_MobjChangeState(actor, S_STALK_HIDE);
             actor->flags &= ~MF_SOLID;
             actor->flags &= ~MF_SHOOTABLE;
@@ -1775,7 +1775,7 @@
         return;
 
     A_FaceTarget(actor);
-    S_StartSound(sfx_skeswg, actor);
+    S_StartSound(SFX_SKESWG, actor);
 }
 
 void C_DECL A_SkelFist(mobj_t *actor)
@@ -1789,7 +1789,7 @@
     if(checkMeleeRange(actor))
     {
         damage = ((P_Random() % 10) + 1) * 6;
-        S_StartSound(sfx_skepch, actor);
+        S_StartSound(SFX_SKEPCH, actor);
         P_DamageMobj(actor->target, actor, actor, damage);
     }
 }
@@ -1797,7 +1797,7 @@
 void C_DECL A_FatRaise(mobj_t *actor)
 {
     A_FaceTarget(actor);
-    S_StartSound(sfx_manatk, actor);
+    S_StartSound(SFX_MANATK, actor);
 }
 
 /**
@@ -2036,15 +2036,15 @@
     case 0:
         return;
 
-    case sfx_podth1:
-    case sfx_podth2:
-    case sfx_podth3:
-        sound = sfx_podth1 + P_Random() % 3;
+    case SFX_PODTH1:
+    case SFX_PODTH2:
+    case SFX_PODTH3:
+        sound = SFX_PODTH1 + P_Random() % 3;
         break;
 
-    case sfx_bgdth1:
-    case sfx_bgdth2:
-        sound = sfx_bgdth1 + P_Random() % 2;
+    case SFX_BGDTH1:
+    case SFX_BGDTH2:
+        sound = SFX_BGDTH1 + P_Random() % 2;
         break;
 
     default:
@@ -2080,7 +2080,7 @@
     mo = P_SpawnMobj3fv(MT_KABOOM, pos);
     if(mo)
     {
-        S_StartSound(sfx_barexp, mo);
+        S_StartSound(SFX_BAREXP, mo);
         mo->mom[MX] = FIX2FLT((P_Random() - 128) << 11);
         mo->mom[MY] = FIX2FLT((P_Random() - 128) << 11);
         mo->target = actor;
@@ -2129,7 +2129,7 @@
 
 void C_DECL A_XScream(mobj_t *actor)
 {
-    S_StartSound(sfx_slop, actor);
+    S_StartSound(SFX_SLOP, actor);
 }
 
 void C_DECL A_Pain(mobj_t *actor)
@@ -2400,7 +2400,7 @@
      * \kludge Only play very loud sounds in map 8.
      * \todo: Implement a MAPINFO option for this.
      */
-    S_StartSound(sfx_hoof |
+    S_StartSound(SFX_HOOF |
                  (gameMode != commercial &&
                   gameMap == 8 ? DDSF_NO_ATTENUATION : 0), mo);
     A_Chase(mo);
@@ -2412,7 +2412,7 @@
      * \kludge Only play very loud sounds in map 8.
      * \todo: Implement a MAPINFO option for this.
      */
-    S_StartSound(sfx_metal |
+    S_StartSound(SFX_MEAL |
                  (gameMode != commercial &&
                   gameMap == 8 ? DDSF_NO_ATTENUATION : 0), mo);
     A_Chase(mo);
@@ -2420,18 +2420,18 @@
 
 void C_DECL A_BabyMetal(mobj_t *mo)
 {
-    S_StartSound(sfx_bspwlk, mo);
+    S_StartSound(SFX_BSPWLK, mo);
     A_Chase(mo);
 }
 
 void C_DECL A_BrainAwake(mobj_t *mo)
 {
-    S_StartSound(sfx_bossit, NULL);
+    S_StartSound(SFX_BOSSIT, NULL);
 }
 
 void C_DECL A_BrainPain(mobj_t *mo)
 {
-    S_StartSound(sfx_bospn, NULL);
+    S_StartSound(SFX_BOSPN, NULL);
 }
 
 void C_DECL A_BrainScream(mobj_t *mo)
@@ -2455,7 +2455,7 @@
             th->tics = 1;
     }
 
-    S_StartSound(sfx_bosdth, NULL);
+    S_StartSound(SFX_BOSDTH, NULL);
 }
 
 void C_DECL A_BrainExplode(mobj_t *mo)
@@ -2520,7 +2520,7 @@
  */
 void C_DECL A_SpawnSound(mobj_t *mo)
 {
-    S_StartSound(sfx_boscub, mo);
+    S_StartSound(SFX_BOSCUB, mo);
     A_SpawnFly(mo);
 }
 
@@ -2573,12 +2573,12 @@
 
 void C_DECL A_PlayerScream(mobj_t *mo)
 {
-    int                 sound = sfx_pldeth; // Default death sound.
+    int                 sound = SFX_PLDETH; // Default death sound.
 
     if((gameMode == commercial) && (mo->health < -50))
     {
         // If the player dies less with less than -50% without gibbing.
-        sound = sfx_pdiehi;
+        sound = SFX_PDIEHI;
     }
 
     S_StartSound(sound, mo);

Modified: trunk/doomsday/plugins/jdoom64/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_inter.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/p_inter.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -158,7 +158,7 @@
         if(player == &players[CONSOLEPLAYER])
             ST_HUDUnHide(HUE_ON_PICKUP_WEAPON);
 
-        S_ConsoleSound(sfx_wpnup, NULL, player - players);
+        S_ConsoleSound(SFX_WPNUP, NULL, player - players);
         return false;
     }
     else
@@ -388,7 +388,7 @@
         return;
     }
 
-    sound = sfx_itemup;
+    sound = SFX_ITEMUP;
     player = toucher->player;
 
     // Dead thing touching. Can happen with a sliding player corpse.
@@ -470,7 +470,7 @@
         player->plr->mo->health = player->health;
         player->update |= PSF_HEALTH;
         P_SetMessage(player, GOTSUPER, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
 
         // Maybe unhide the HUD?
         if(player == &players[CONSOLEPLAYER])
@@ -485,7 +485,7 @@
         player->update |= PSF_HEALTH;
         P_GiveArmor(player, armorClass[1]);
         P_SetMessage(player, GOTMSPHERE, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
 
         // Maybe unhide the HUD?
         if(player == &players[CONSOLEPLAYER])
@@ -573,7 +573,7 @@
         if(!P_GivePower(player, PT_INVULNERABILITY))
             return;
         P_SetMessage(player, GOTINVUL, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_PSTR:
@@ -585,35 +585,35 @@
             player->pendingWeapon = WT_FIRST;
             player->update |= PSF_PENDING_WEAPON | PSF_READY_WEAPON;
         }
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_PINS:
         if(!P_GivePower(player, PT_INVISIBILITY))
             return;
         P_SetMessage(player, GOTINVIS, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_SUIT:
         if(!P_GivePower(player, PT_IRONFEET))
             return;
         P_SetMessage(player, GOTSUIT, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_PMAP:
         if(!P_GivePower(player, PT_ALLMAP))
             return;
         P_SetMessage(player, GOTMAP, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
     case SPR_PVIS:
         if(!P_GivePower(player, PT_INFRARED))
             return;
         P_SetMessage(player, GOTVISOR, false);
-        sound = sfx_getpow;
+        sound = SFX_GETPOW;
         break;
 
         // ammo
@@ -682,49 +682,49 @@
         if(!P_GiveWeapon(player, WT_SEVENTH, false))
             return;
         P_SetMessage(player, GOTBFG9000, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_MGUN:
         if(!P_GiveWeapon(player, WT_FOURTH, special->flags & MF_DROPPED))
             return;
         P_SetMessage(player, GOTCHAINGUN, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_CSAW:
         if(!P_GiveWeapon(player, WT_EIGHTH, false))
             return;
         P_SetMessage(player, GOTCHAINSAW, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_LAUN:
         if(!P_GiveWeapon(player, WT_FIFTH, false))
             return;
         P_SetMessage(player, GOTLAUNCHER, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_PLAS:
         if(!P_GiveWeapon(player, WT_SIXTH, false))
             return;
         P_SetMessage(player, GOTPLASMA, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_SHOT:
         if(!P_GiveWeapon(player, WT_THIRD, special->flags & MF_DROPPED))
             return;
         P_SetMessage(player, GOTSHOTGUN, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_SGN2:
         if(!P_GiveWeapon(player, WT_NINETH, special->flags & MF_DROPPED))
             return;
         P_SetMessage(player, GOTSHOTGUN2, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_LGUN: // jd64
@@ -732,7 +732,7 @@
             return;
 
         P_SetMessage(player, GOTUNMAKER, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_POW1: // jd64

Modified: trunk/doomsday/plugins/jdoom64/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_mobj.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/p_mobj.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -162,7 +162,7 @@
 void P_BounceMissile(mobj_t *mo)   //kaiser
 {
     mo->mom[MZ] *= -(mo->reactionTime * (1.0f / 192));
-    S_StartSound(sfx_ssdth, mo);
+    S_StartSound(SFX_SSDTH, mo);
 }
 
 void P_FloorBounceMissile(mobj_t *mo)
@@ -506,7 +506,7 @@
                 mo->dPlayer->viewHeightDelta = mo->mom[MZ] / 8;
 
                 if(mo->player->health > 0)
-                    S_StartSound(sfx_oof, mo);
+                    S_StartSound(SFX_OOF, mo);
             }
 
             mo->mom[MZ] = 0;
@@ -601,7 +601,7 @@
                 // Fix DOOM bug - dead players grunting when hitting the ground
                 // (e.g., after an archvile attack)
                 if(mo->player->health > 0)
-                    S_StartSound(sfx_oof, mo);
+                    S_StartSound(SFX_OOF, mo);
             }
 
             P_HitFloor(mo);
@@ -694,13 +694,13 @@
     // Spawn a teleport fog at old spot.
     mo = P_SpawnMobj3f(MT_TFOG, mobj->pos[VX], mobj->pos[VY],
                        P_GetFloatp(mobj->subsector, DMU_FLOOR_HEIGHT));
-    S_StartSound(sfx_telept, mo);
+    S_StartSound(SFX_TELEPT, mo);
 
     // Spawn a teleport fog at the new spot.
     ss = R_PointInSubsector(pos[VX], pos[VY]);
     mo = P_SpawnMobj3f(MT_TFOG, pos[VX], pos[VY],
                        P_GetFloatp(ss, DMU_FLOOR_HEIGHT));
-    S_StartSound(sfx_telept, mo);
+    S_StartSound(SFX_TELEPT, mo);
 
     if(mobj->info->flags & MF_SPAWNCEILING)
         pos[VZ] = ONCEILINGZ;
@@ -1059,7 +1059,7 @@
     // jd64 >
     // Spawn a teleport fog at the new spot
     //mo = P_SpawnMobj3fv(MT_IFOG, pos);
-    //S_StartSound(sfx_itmbk, mo);
+    //S_StartSound(SFX_ITMBK, mo);
     // < d64tc
 
     // Find which type to spawn.
@@ -1095,7 +1095,7 @@
 
         // jd64 >
         mo->intFlags |= MIF_FADE;
-        S_StartSound(sfx_itmbk, mo);
+        S_StartSound(SFX_ITMBK, mo);
         mo->translucency = 255;
         // < d64tc
     }

Modified: trunk/doomsday/plugins/jdoom64/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_pspr.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/p_pspr.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -443,7 +443,7 @@
     // Turn to face target.
     if(lineTarget)
     {
-        S_StartSound(sfx_punch, player->plr->mo);
+        S_StartSound(SFX_PUNCH, player->plr->mo);
 
         player->plr->mo->angle =
             R_PointToAngle2(player->plr->mo->pos[VX], player->plr->mo->pos[VY],
@@ -471,11 +471,11 @@
 
     if(!lineTarget)
     {
-        S_StartSound(sfx_sawful, player->plr->mo);
+        S_StartSound(SFX_SAWFUL, player->plr->mo);
         return;
     }
 
-    S_StartSound(sfx_sawhit, player->plr->mo);
+    S_StartSound(SFX_SAWHIT, player->plr->mo);
 
     // Turn to face target.
     angle =
@@ -561,7 +561,7 @@
  */
 void C_DECL A_PlasmaBuzz(player_t *player)
 {
-    S_StartSound(sfx_psidl, player->plr->mo);
+    S_StartSound(SFX_PSIDL, player->plr->mo);
 }
 
 /**
@@ -709,7 +709,7 @@
 
 void C_DECL A_FirePistol(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_pistol, player->plr->mo);
+    S_StartSound(SFX_PISTOL, player->plr->mo);
 
     P_MobjChangeState(player->plr->mo, PCLASS_INFO(player->class)->attackEndState);
 
@@ -729,7 +729,7 @@
 {
     int                 i;
 
-    S_StartSound(sfx_shotgn, player->plr->mo);
+    S_StartSound(SFX_SHOTGN, player->plr->mo);
     P_MobjChangeState(player->plr->mo, PCLASS_INFO(player->class)->attackEndState);
 
     P_ShotAmmo(player);
@@ -752,7 +752,7 @@
     angle_t             angle;
     int                 damage;
 
-    S_StartSound(sfx_dshtgn, player->plr->mo);
+    S_StartSound(SFX_DSHTGN, player->plr->mo);
     P_MobjChangeState(player->plr->mo, PCLASS_INFO(player->class)->attackEndState);
 
     P_ShotAmmo(player);
@@ -792,23 +792,23 @@
 
 void C_DECL A_OpenShotgun2(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_dbopn, player->plr->mo);
+    S_StartSound(SFX_DBOPN, player->plr->mo);
 }
 
 void C_DECL A_LoadShotgun2(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_dbload, player->plr->mo);
+    S_StartSound(SFX_DBLOAD, player->plr->mo);
 }
 
 void C_DECL A_CloseShotgun2(player_t *player, pspdef_t * psp)
 {
-    S_StartSound(sfx_dbcls, player->plr->mo);
+    S_StartSound(SFX_DBCLS, player->plr->mo);
     A_ReFire(player, psp);
 }
 
 void C_DECL A_FireCGun(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_pistol, player->plr->mo);
+    S_StartSound(SFX_PISTOL, player->plr->mo);
 
     P_MobjChangeState(player->plr->mo, PCLASS_INFO(player->class)->attackEndState);
 
@@ -884,7 +884,7 @@
 
 void C_DECL A_BFGsound(player_t *player, pspdef_t *psp)
 {
-    S_StartSound(sfx_bfg, player->plr->mo);
+    S_StartSound(SFX_BFG, player->plr->mo);
 }
 
 /**

Modified: trunk/doomsday/plugins/jdoom64/src/p_sound.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_sound.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/p_sound.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -51,7 +51,7 @@
 {
     int                 mnum;
 
-    mnum = mus_runnin + map - 1;
+    mnum = MUS_RUNNIN + map - 1;
 
     return mnum;
 }

Modified: trunk/doomsday/plugins/jdoom64/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_spec.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/p_spec.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -940,7 +940,7 @@
         if(cfg.secretMsg)
         {
             P_SetMessage(player, "You've found a secret area!", false);
-            // S_ConsoleSound(sfx_getpow, 0, player - players); // jd64
+            // S_ConsoleSound(SFX_GETPOW, 0, player - players); // jd64
         }
         break;
 /*
@@ -1106,7 +1106,7 @@
                               (int) button->section);
                 }
 
-                S_StartSound(sfx_swtchn,
+                S_StartSound(SFX_SWTCHN,
                              P_GetPtrp(frontsector, DMU_SOUND_ORIGIN));
 
                 button->line = NULL;
@@ -1153,7 +1153,7 @@
         if(!(levelTime & 32))
         {
             P_SetFloatp(sec, DMU_LIGHT_LEVEL, 1);
-            S_StartSound(sfx_sssit, P_GetPtrp(sec, DMU_SOUND_ORIGIN));
+            S_StartSound(SFX_SSSIT, P_GetPtrp(sec, DMU_SOUND_ORIGIN));
         }
     }
 }
@@ -1416,7 +1416,7 @@
         // Prevent zombies from exiting levels,
         if(mo->player && mo->player->health <= 0 && !cfg.zombiesCanExit)
         {
-            S_StartSound(sfx_noway, mo);
+            S_StartSound(SFX_NOWAY, mo);
             return false;
         }
 
@@ -1498,7 +1498,7 @@
         // Prevent zombies from exiting levels.
         if(mo->player && mo->player->health <= 0 && !cfg.zombiesCanExit)
         {
-            S_StartSound(sfx_noway, mo);
+            S_StartSound(SFX_NOWAY, mo);
             return false;
         }
 

Modified: trunk/doomsday/plugins/jdoom64/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_telept.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/p_telept.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -147,7 +147,7 @@
         {
             // Spawn teleport fog at source and destination.
             fog = P_SpawnMobj3fv(MT_TFOG, oldPos);
-            S_StartSound(sfx_telept, fog);
+            S_StartSound(SFX_TELEPT, fog);
 
             an = dest->angle >> ANGLETOFINESHIFT;
             fog = P_SpawnMobj3f(MT_TFOG,
@@ -156,7 +156,7 @@
                                 mo->pos[VZ]);
 
             // Emit sound, where?
-            S_StartSound(sfx_telept, fog);
+            S_StartSound(SFX_TELEPT, fog);
         }
 
         mo->angle = dest->angle;
@@ -329,7 +329,7 @@
             mo->angle = origin->angle;
 
             // Emit sound, where?
-            S_StartSound(sfx_itmbk, mo);
+            S_StartSound(SFX_ITMBK, mo);
 
             if(mobjInfo[spawntype].flags & MF_COUNTKILL)
                 totalKills++;

Modified: trunk/doomsday/plugins/jdoom64/src/wi_stuff.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/wi_stuff.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jdoom64/src/wi_stuff.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -419,14 +419,14 @@
             dmTotals[i] = WI_fragSum(i);
         }
 
-        S_LocalSound(sfx_barexp, 0);
+        S_LocalSound(SFX_BAREXP, 0);
         dmState = 4;
     }
 
     if(dmState == 2)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         stillTicking = false;
         for(i = 0; i < NUM_TEAMS; ++i)
@@ -461,7 +461,7 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             dmState++;
         }
     }
@@ -469,7 +469,7 @@
     {
         if(accelerateStage)
         {
-            S_LocalSound(sfx_slop, 0);
+            S_LocalSound(SFX_SLOP, 0);
             WI_initNoState();
         }
     }
@@ -626,14 +626,14 @@
                 cntFrags[i] = teamInfo[i].totalFrags;
         }
 
-        S_LocalSound(sfx_barexp, 0);
+        S_LocalSound(SFX_BAREXP, 0);
         ngState = 10;
     }
 
     if(ngState == 2)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
         stillTicking = false;
 
         for(i = 0; i < NUM_TEAMS; ++i)
@@ -648,14 +648,14 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             ngState++;
         }
     }
     else if(ngState == 4)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
         stillTicking = false;
 
         for(i = 0; i < NUM_TEAMS; ++i)
@@ -669,14 +669,14 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             ngState++;
         }
     }
     else if(ngState == 6)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         stillTicking = false;
 
@@ -692,14 +692,14 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             ngState += 1 + 2 * !doFrags;
         }
     }
     else if(ngState == 8)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         stillTicking = false;
 
@@ -715,7 +715,7 @@
 
         if(!stillTicking)
         {
-            S_LocalSound(sfx_pldeth, 0);
+            S_LocalSound(SFX_PLDETH, 0);
             ngState++;
         }
     }
@@ -723,7 +723,7 @@
     {
         if(accelerateStage)
         {
-            S_LocalSound(sfx_sgcock, 0);
+            S_LocalSound(SFX_SGCOCK, 0);
             WI_initNoState();
         }
     }
@@ -828,7 +828,7 @@
         cntTime = plrs[me].time / TICRATE;
         if(wbs->parTime != -1)
             cntPar = wbs->parTime / TICRATE;
-        S_LocalSound(sfx_barexp, 0);
+        S_LocalSound(SFX_BAREXP, 0);
         spState = 10;
     }
 
@@ -837,12 +837,12 @@
         cntKills[0] += 2;
 
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         if(cntKills[0] >= (plrs[me].kills * 100) / wbs->maxKills)
         {
             cntKills[0] = (plrs[me].kills * 100) / wbs->maxKills;
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             spState++;
         }
     }
@@ -851,12 +851,12 @@
         cntItems[0] += 2;
 
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         if(cntItems[0] >= (plrs[me].items * 100) / wbs->maxItems)
         {
             cntItems[0] = (plrs[me].items * 100) / wbs->maxItems;
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             spState++;
         }
     }
@@ -865,19 +865,19 @@
         cntSecret[0] += 2;
 
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         if(cntSecret[0] >= (plrs[me].secret * 100) / wbs->maxSecret)
         {
             cntSecret[0] = (plrs[me].secret * 100) / wbs->maxSecret;
-            S_LocalSound(sfx_barexp, 0);
+            S_LocalSound(SFX_BAREXP, 0);
             spState++;
         }
     }
     else if(spState == 8)
     {
         if(!(bcnt & 3))
-            S_LocalSound(sfx_pistol, 0);
+            S_LocalSound(SFX_PISTOL, 0);
 
         cntTime += 3;
 
@@ -894,7 +894,7 @@
 
                 if(cntTime >= plrs[me].time / TICRATE)
                 {
-                    S_LocalSound(sfx_barexp, 0);
+                    S_LocalSound(SFX_BAREXP, 0);
                     spState++;
                 }
             }
@@ -906,7 +906,7 @@
     {
         if(accelerateStage)
         {
-            S_LocalSound(sfx_sgcock, 0);
+            S_LocalSound(SFX_SGCOCK, 0);
             WI_initNoState();
         }
     }
@@ -999,7 +999,7 @@
     if(bcnt == 1)
     {
         // Intermission music.
-        S_StartMusicNum(mus_dm2int, true);
+        S_StartMusicNum(MUS_DM2INT, true);
     }
 
     WI_checkForAccelerate();

Modified: trunk/doomsday/plugins/jheretic/include/sounds.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/sounds.h	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/include/sounds.h	2008-05-31 09:41:58 UTC (rev 5686)
@@ -4,7 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2007 Jaakko Keränen <jaakko.keranen@...>
- *\author Copyright © 2006-2007 Daniel Swanson <danij@...>
+ *\author Copyright © 2006-2008 Daniel Swanson <danij@...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,204 +46,204 @@
 
 // Sounds.
 typedef enum {
-	sfx_None,					   // 000
-	sfx_gldhit,					   // 001
-	sfx_gntful,					   // 002
-	sfx_gnthit,					   // 003
-	sfx_gntpow,					   // 004
-	sfx_gntact,					   // 005
-	sfx_gntuse,					   // 006
-	sfx_phosht,					   // 007
-	sfx_phohit,					   // 008
-	sfx_phopow,					   // 009
-	sfx_lobsht,					   // 010
-	sfx_lobhit,					   // 011
-	sfx_lobpow,					   // 012
-	sfx_hrnsht,					   // 013
-	sfx_hrnhit,					   // 014
-	sfx_hrnpow,					   // 015
-	sfx_ramphit,				   // 016
-	sfx_ramrain,				   // 017
-	sfx_bowsht,					   // 018
-	sfx_stfhit,					   // 019
-	sfx_stfpow,					   // 020
-	sfx_stfcrk,					   // 021
-	sfx_impsit,					   // 022
-	sfx_impat1,					   // 023
-	sfx_impat2,					   // 024
-	sfx_impdth,					   // 025
-	sfx_impact,					   // 026
-	sfx_imppai,					   // 027
-	sfx_mumsit,					   // 028
-	sfx_mumat1,					   // 029
-	sfx_mumat2,					   // 030
-	sfx_mumdth,					   // 031
-	sfx_mumact,					   // 032
-	sfx_mumpai,					   // 033
-	sfx_mumhed,					   // 034
-	sfx_bstsit,					   // 035
-	sfx_bstatk,					   // 036
-	sfx_bstdth,					   // 037
-	sfx_bstact,					   // 038
-	sfx_bstpai,					   // 039
-	sfx_clksit,					   // 040
-	sfx_clkatk,					   // 041
-	sfx_clkdth,					   // 042
-	sfx_clkact,					   // 043
-	sfx_clkpai,					   // 044
-	sfx_snksit,					   // 045
-	sfx_snkatk,					   // 046
-	sfx_snkdth,					   // 047
-	sfx_snkact,					   // 048
-	sfx_snkpai,					   // 049
-	sfx_kgtsit,					   // 050
-	sfx_kgtatk,					   // 051
-	sfx_kgtat2,					   // 052
-	sfx_kgtdth,					   // 053
-	sfx_kgtact,					   // 054
-	sfx_kgtpai,					   // 055
-	sfx_wizsit,					   // 056
-	sfx_wizatk,					   // 057
-	sfx_wizdth,					   // 058
-	sfx_wizact,					   // 059
-	sfx_wizpai,					   // 060
-	sfx_minsit,					   // 061
-	sfx_minat1,					   // 062
-	sfx_minat2,					   // 063
-	sfx_minat3,					   // 064
-	sfx_mindth,					   // 065
-	sfx_minact,					   // 066
-	sfx_minpai,					   // 067
-	sfx_hedsit,					   // 068
-	sfx_hedat1,					   // 069
-	sfx_hedat2,					   // 070
-	sfx_hedat3,					   // 071
-	sfx_heddth,					   // 072
-	sfx_hedact,					   // 073
-	sfx_hedpai,					   // 074
-	sfx_sorzap,					   // 075
-	sfx_sorrise,				   // 076
-	sfx_sorsit,					   // 077
-	sfx_soratk,					   // 078
-	sfx_soract,					   // 079
-	sfx_sorpai,					   // 080
-	sfx_sordsph,				   // 081
-	sfx_sordexp,				   // 082
-	sfx_sordbon,				   // 083
-	sfx_sbtsit,					   // 084
-	sfx_sbtatk,					   // 085
-	sfx_sbtdth,					   // 086
-	sfx_sbtact,					   // 087
-	sfx_sbtpai,					   // 088
-	sfx_plroof,					   // 089
-	sfx_plrpai,					   // 090
-	sfx_plrdth,					   // 091
-	sfx_gibdth,					   // 092
-	sfx_plrwdth,				   // 093
-	sfx_plrcdth,				   // 094
-	sfx_itemup,					   // 095
-	sfx_wpnup,					   // 096
-	sfx_telept,					   // 097
-	sfx_doropn,					   // 098
-	sfx_dorcls,					   // 099
-	sfx_dormov,					   // 100
-	sfx_artiup,					   // 101
-	sfx_switch,					   // 102
-	sfx_pstart,					   // 103
-	sfx_pstop,					   // 104
-	sfx_stnmov,					   // 105
-	sfx_chicpai,				   // 106
-	sfx_chicatk,				   // 107
-	sfx_chicdth,				   // 108
-	sfx_chicact,				   // 109
-	sfx_chicpk1,				   // 110
-	sfx_chicpk2,				   // 111
-	sfx_chicpk3,				   // 112
-	sfx_keyup,					   // 113
-	sfx_ripslop,				   // 114
-	sfx_newpod,					   // 115
-	sfx_podexp,					   // 116
-	sfx_bounce,					   // 117
-	sfx_volsht,					   // 118
-	sfx_volhit,					   // 119
-	sfx_burn,					   // 120
-	sfx_splash,					   // 121
-	sfx_gloop,					   // 122
-	sfx_respawn,				   // 123
-	sfx_blssht,					   // 124
-	sfx_blshit,					   // 125
-	sfx_chat,					   // 126
-	sfx_artiuse,				   // 127
-	sfx_gfrag,					   // 128
-	sfx_waterfl,				   // 129
-	sfx_wind,					   // 130
-	sfx_amb1,					   // 131
-	sfx_amb2,					   // 132
-	sfx_amb3,					   // 133
-	sfx_amb4,					   // 134
-	sfx_amb5,					   // 135
-	sfx_amb6,					   // 136
-	sfx_amb7,					   // 137
-	sfx_amb8,					   // 138
-	sfx_amb9,					   // 139
-	sfx_amb10,					   // 140
-	sfx_amb11,					   // 141
+	SFX_NONE,					   // 000
+	SFX_GLDHIT,					   // 001
+	SFX_GNTFUL,					   // 002
+	SFX_GNTHIT,					   // 003
+	SFX_GNTPOW,					   // 004
+	SFX_GNTACT,					   // 005
+	SFX_GNTUSE,					   // 006
+	SFX_PHOSHT,					   // 007
+	SFX_PHOHIT,					   // 008
+	SFX_PHOPOW,					   // 009
+	SFX_LOBSHT,					   // 010
+	SFX_LOBHIT,					   // 011
+	SFX_LOBPOW,					   // 012
+	SFX_HRNSHT,					   // 013
+	SFX_HRNHIT,					   // 014
+	SFX_HRNPOW,					   // 015
+	SFX_RAMPHIT,				   // 016
+	SFX_RAMRAIN,				   // 017
+	SFX_BOWSHT,					   // 018
+	SFX_STFHIT,					   // 019
+	SFX_STFPOW,					   // 020
+	SFX_STFCRK,					   // 021
+	SFX_IMPSIT,					   // 022
+	SFX_IMPAT1,					   // 023
+	SFX_IMPAT2,					   // 024
+	SFX_IMPDTH,					   // 025
+	SFX_IMPACT,					   // 026
+	SFX_IMPPAI,					   // 027
+	SFX_MUMSIT,					   // 028
+	SFX_MUMAT1,					   // 029
+	SFX_MUMAT2,					   // 030
+	SFX_MUMDTH,					   // 031
+	SFX_MUMACT,					   // 032
+	SFX_MUMPAI,					   // 033
+	SFX_MUMHED,					   // 034
+	SFX_BSTSIT,					   // 035
+	SFX_BSTATK,					   // 036
+	SFX_BSTDTH,					   // 037
+	SFX_BSTACT,					   // 038
+	SFX_BSTPAI,					   // 039
+	SFX_CLKSIT,					   // 040
+	SFX_CLKATK,					   // 041
+	SFX_CLKDTH,					   // 042
+	SFX_CLKACT,					   // 043
+	SFX_CLKPAI,					   // 044
+	SFX_SNKSIT,					   // 045
+	SFX_SNKATK,					   // 046
+	SFX_SNKDTH,					   // 047
+	SFX_SNKACT,					   // 048
+	SFX_SNKPAI,					   // 049
+	SFX_KGTSIT,					   // 050
+	SFX_KGTATK,					   // 051
+	SFX_KGTAT2,					   // 052
+	SFX_KGTDTH,					   // 053
+	SFX_KGTACT,					   // 054
+	SFX_KGTPAI,					   // 055
+	SFX_WIZSIT,					   // 056
+	SFX_WIZATK,					   // 057
+	SFX_WIZDTH,					   // 058
+	SFX_WIZACT,					   // 059
+	SFX_WIZPAI,					   // 060
+	SFX_MINSIT,					   // 061
+	SFX_MINAT1,					   // 062
+	SFX_MINAT2,					   // 063
+	SFX_MINAT3,					   // 064
+	SFX_MINDTH,					   // 065
+	SFX_MINACT,					   // 066
+	SFX_MINPAI,					   // 067
+	SFX_HEDSIT,					   // 068
+	SFX_HEDAT1,					   // 069
+	SFX_HEDAT2,					   // 070
+	SFX_HEDAT3,					   // 071
+	SFX_HEDDTH,					   // 072
+	SFX_HEDACT,					   // 073
+	SFX_HEDPAI,					   // 074
+	SFX_SORZAP,					   // 075
+	SFX_SORRISE,				   // 076
+	SFX_SORSIT,					   // 077
+	SFX_SORATK,					   // 078
+	SFX_SORACT,					   // 079
+	SFX_SORPAI,					   // 080
+	SFX_SORDSPH,				   // 081
+	SFX_SORDEXP,				   // 082
+	SFX_SORDBON,				   // 083
+	SFX_SBTSIT,					   // 084
+	SFX_SBTATK,					   // 085
+	SFX_SBTDTH,					   // 086
+	SFX_SBTACT,					   // 087
+	SFX_SBTPAI,					   // 088
+	SFX_PLROOF,					   // 089
+	SFX_PLRPAI,					   // 090
+	SFX_PLRDTH,					   // 091
+	SFX_GIBDTH,					   // 092
+	SFX_PLRWDTH,				   // 093
+	SFX_PLRCDTH,				   // 094
+	SFX_ITEMUP,					   // 095
+	SFX_WPNUP,					   // 096
+	SFX_TELEPT,					   // 097
+	SFX_DOROPN,					   // 098
+	SFX_DORCLS,					   // 099
+	SFX_DORMOV,					   // 100
+	SFX_ARTIUP,					   // 101
+	SFX_SWITCH,					   // 102
+	SFX_PSTART,					   // 103
+	SFX_PSTOP,					   // 104
+	SFX_STNMOV,					   // 105
+	SFX_CHICPAI,				   // 106
+	SFX_CHICATK,				   // 107
+	SFX_CHICDTH,				   // 108
+	SFX_CHICACT,				   // 109
+	SFX_CHICPK1,				   // 110
+	SFX_CHICPK2,				   // 111
+	SFX_CHICPK3,				   // 112
+	SFX_KEYUP,					   // 113
+	SFX_RIPSLOP,				   // 114
+	SFX_NEWPOD,					   // 115
+	SFX_PODEXP,					   // 116
+	SFX_BOUNCE,					   // 117
+	SFX_VOLSHT,					   // 118
+	SFX_VOLHIT,					   // 119
+	SFX_BURN,					   // 120
+	SFX_SPLASH,					   // 121
+	SFX_GLOOP,					   // 122
+	SFX_RESPAWN,				   // 123
+	SFX_BLSSHT,					   // 124
+	SFX_BLSHIT,					   // 125
+	SFX_CHAT,					   // 126
+	SFX_ARTIUSE,				   // 127
+	SFX_GFRAG,					   // 128
+	SFX_WATERFL,				   // 129
+	SFX_WIND,					   // 130
+	SFX_AMB1,					   // 131
+	SFX_AMB2,					   // 132
+	SFX_AMB3,					   // 133
+	SFX_AMB4,					   // 134
+	SFX_AMB5,					   // 135
+	SFX_AMB6,					   // 136
+	SFX_AMB7,					   // 137
+	SFX_AMB8,					   // 138
+	SFX_AMB9,					   // 139
+	SFX_AMB10,					   // 140
+	SFX_AMB11,					   // 141
 	NUMSFX						   // 142
 } sfxenum_t;
 
 // Music.
 typedef enum {
-	mus_e1m1,					   // 000
-	mus_e1m2,					   // 001
-	mus_e1m3,					   // 002
-	mus_e1m4,					   // 003
-	mus_e1m5,					   // 004
-	mus_e1m6,					   // 005
-	mus_e1m7,					   // 006
-	mus_e1m8,					   // 007
-	mus_e1m9,					   // 008
-	mus_e2m1,					   // 009
-	mus_e2m2,					   // 010
-	mus_e2m3,					   // 011
-	mus_e2m4,					   // 012
-	mus_e2m5,					   // 013
-	mus_e2m6,					   // 014
-	mus_e2m7,					   // 015
-	mus_e2m8,					   // 016
-	mus_e2m9,					   // 017
-	mus_e3m1,					   // 018
-	mus_e3m2,					   // 019
-	mus_e3m3,					   // 020
-	mus_e3m4,					   // 021
-	mus_e3m5,					   // 022
-	mus_e3m6,					   // 023
-	mus_e3m7,					   // 024
-	mus_e3m8,					   // 025
-	mus_e3m9,					   // 026
-	mus_e4m1,					   // 027
-	mus_e4m2,					   // 028
-	mus_e4m3,					   // 029
-	mus_e4m4,					   // 030
-	mus_e4m5,					   // 031
-	mus_e4m6,					   // 032
-	mus_e4m7,					   // 033
-	mus_e4m8,					   // 034
-	mus_e4m9,					   // 035
-	mus_e5m1,					   // 036
-	mus_e5m2,					   // 037
-	mus_e5m3,					   // 038
-	mus_e5m4,					   // 039
-	mus_e5m5,					   // 040
-	mus_e5m6,					   // 041
-	mus_e5m7,					   // 042
-	mus_e5m8,					   // 043
-	mus_e5m9,					   // 044
-	mus_e6m1,					   // 045
-	mus_e6m2,					   // 046
-	mus_e6m3,					   // 047
-	mus_titl,					   // 048
-	mus_intr,					   // 049
-	mus_cptd,					   // 050
+	MUS_E1M1,					   // 000
+	MUS_E1M2,					   // 001
+	MUS_E1M3,					   // 002
+	MUS_E1M4,					   // 003
+	MUS_E1M5,					   // 004
+	MUS_E1M6,					   // 005
+	MUS_E1M7,					   // 006
+	MUS_E1M8,					   // 007
+	MUS_E1M9,					   // 008
+	MUS_E2M1,					   // 009
+	MUS_E2M2,					   // 010
+	MUS_E2M3,					   // 011
+	MUS_E2M4,					   // 012
+	MUS_E2M5,					   // 013
+	MUS_E2M6,					   // 014
+	MUS_E2M7,					   // 015
+	MUS_E2M8,					   // 016
+	MUS_E2M9,					   // 017
+	MUS_E3M1,					   // 018
+	MUS_E3M2,					   // 019
+	MUS_E3M3,					   // 020
+	MUS_E3M4,					   // 021
+	MUS_E3M5,					   // 022
+	MUS_E3M6,					   // 023
+	MUS_E3M7,					   // 024
+	MUS_E3M8,					   // 025
+	MUS_E3M9,					   // 026
+	MUS_E4M1,					   // 027
+	MUS_E4M2,					   // 028
+	MUS_E4M3,					   // 029
+	MUS_E4M4,					   // 030
+	MUS_E4M5,					   // 031
+	MUS_E4M6,					   // 032
+	MUS_E4M7,					   // 033
+	MUS_E4M8,					   // 034
+	MUS_E4M9,					   // 035
+	MUS_E5M1,					   // 036
+	MUS_E5M2,					   // 037
+	MUS_E5M3,					   // 038
+	MUS_E5M4,					   // 039
+	MUS_E5M5,					   // 040
+	MUS_E5M6,					   // 041
+	MUS_E5M7,					   // 042
+	MUS_E5M8,					   // 043
+	MUS_E5M9,					   // 044
+	MUS_E6M1,					   // 045
+	MUS_E6M2,					   // 046
+	MUS_E6M3,					   // 047
+	MUS_TITL,					   // 048
+	MUS_INTR,					   // 049
+	MUS_CPTD,					   // 050
 	NUMMUSIC					   // 051
 } musicenum_t;
 

Modified: trunk/doomsday/plugins/jheretic/src/in_lude.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/in_lude.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/in_lude.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -451,7 +451,7 @@
         {
             interState = 2;
             skipIntermission = false;
-            S_StartSound(sfx_dorcls, NULL);
+            S_StartSound(SFX_DORCLS, NULL);
             NetSv_Intermission(IMF_STATE, interState, 0);
             return;
         }
@@ -459,7 +459,7 @@
         interState = 3;
         cnt = 10;
         skipIntermission = false;
-        S_StartSound(sfx_dorcls, NULL);
+        S_StartSound(SFX_DORCLS, NULL);
         NetSv_Intermission(IMF_STATE, interState, 0);
     }
 }
@@ -524,7 +524,7 @@
 
     if(oldInterState != 2 && interState == 2)
     {
-        S_LocalSound(sfx_pstop, NULL);
+        S_LocalSound(SFX_PSTOP, NULL);
     }
 
     oldInterState = interState;
@@ -695,7 +695,7 @@
 
     if(sounds < 1 && interTime >= 30)
     {
-        S_LocalSound(sfx_dorcls, NULL);
+        S_LocalSound(SFX_DORCLS, NULL);
         sounds++;
     }
 
@@ -712,7 +712,7 @@
 
     if(sounds < 2 && interTime >= 60)
     {
-        S_LocalSound(sfx_dorcls, NULL);
+        S_LocalSound(SFX_DORCLS, NULL);
         sounds++;
     }
 
@@ -729,7 +729,7 @@
 
     if(sounds < 3 && interTime >= 90)
     {
-        S_LocalSound(sfx_dorcls, NULL);
+        S_LocalSound(SFX_DORCLS, NULL);
         sounds++;
     }
 
@@ -746,7 +746,7 @@
 
     if(sounds < 4 && interTime >= 150)
     {
-        S_LocalSound(sfx_dorcls, NULL);
+        S_LocalSound(SFX_DORCLS, NULL);
         sounds++;
     }
 
@@ -807,7 +807,7 @@
             }
             else if(interTime >= 40 && sounds < 1)
             {
-                S_LocalSound(sfx_dorcls, NULL);
+                S_LocalSound(SFX_DORCLS, NULL);
                 sounds++;
             }
 
@@ -871,13 +871,13 @@
 
     if(interTime >= 20 && sounds < 1)
     {
-        S_LocalSound(sfx_dorcls, NULL);
+        S_LocalSound(SFX_DORCLS, NULL);
         sounds++;
     }
 
     if(interTime >= 100 && slaughterBoy && sounds < 2)
     {
-        S_LocalSound(sfx_wpnup, NULL);
+        S_LocalSound(SFX_WPNUP, NULL);
         sounds++;
     }
 

Modified: trunk/doomsday/plugins/jheretic/src/m_cheat.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/m_cheat.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/m_cheat.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -360,7 +360,7 @@
         if(cheatAddKey(&cheats[i], key, &eat))
         {
             cheats[i].func(&players[CONSOLEPLAYER], &cheats[i]);
-            S_LocalSound(sfx_dorcls, NULL);
+            S_LocalSound(SFX_DORCLS, NULL);
         }
     }
 
@@ -784,7 +784,7 @@
 {
     if(G_GetGameState() != GS_LEVEL)
     {
-        S_LocalSound(sfx_chat, NULL);
+        S_LocalSound(SFX_CHAT, NULL);
         Con_Printf("Can only suicide when in a game!\n");
         return true;
     }
@@ -906,7 +906,7 @@
 
     if(G_GetGameState() != GS_LEVEL)
     {
-        S_LocalSound(sfx_chat, NULL);
+        S_LocalSound(SFX_CHAT, NULL);
         Con_Printf("Can only exit a level when in a game!\n");
         return true;
     }

Modified: trunk/doomsday/plugins/jheretic/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_enemy.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/p_enemy.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -842,7 +842,7 @@
     if(P_CheckMeleeRange(actor))
     {
         P_DamageMobj(actor->target, actor, actor, HITDICE(3));
-        S_StartSound(sfx_kgtat2, actor);
+        S_StartSound(SFX_KGTAT2, actor);
         return;
     }
 
@@ -1024,7 +1024,7 @@
     mo->target = oldChicken.target;
 
     fog = P_SpawnMobj3f(MT_TFOG, pos[VX], pos[VY], pos[VZ] + TELEFOGHEIGHT);
-    S_StartSound(sfx_telept, fog);
+    S_StartSound(SFX_TELEPT, fog);
 
     return true;
 }
@@ -1101,11 +1101,11 @@
     if(P_CheckMeleeRange(actor))
     {
         P_DamageMobj(actor->target, actor, actor, HITDICE(2));
-        S_StartSound(sfx_mumat2, actor);
+        S_StartSound(SFX_MUMAT2, actor);
         return;
     }
 
-    S_StartSound(sfx_mumat1, actor);
+    S_StartSound(SFX_MUMAT1, actor);
 }
 
 /**
@@ -1251,10 +1251,10 @@
     if(P_TeleportMove(actor, x, y, false))
     {
         mo = P_SpawnMobj3fv(MT_SOR2TELEFADE, prevpos);
-        S_StartSound(sfx_telept, mo);
+        S_StartSound(SFX_TELEPT, mo);
 
         P_MobjChangeState(actor, S_SOR2_TELE1);
-        S_StartSound(sfx_telept, actor);
+        S_StartSound(SFX_TELEPT, actor);
         actor->pos[VZ] = actor->floorZ;
         actor->angle = bossSpots[i % bossSpotCount].angle;
         actor->mom[MX] = actor->mom[MY] = actor->mom[MZ] = 0;
@@ -1342,7 +1342,7 @@
     actor->flags &= ~MF_MISSILE;
 
     fog = P_SpawnMobj3fv(MT_TFOG, actor->pos);
-    S_StartSound(sfx_telept, fog);
+    S_StartSound(SFX_TELEPT, fog);
 }
 
 void C_DECL A_Sor2DthInit(mobj_t *actor)
@@ -1367,32 +1367,32 @@
  */
 void C_DECL A_SorZap(mobj_t *actor)
 {
-    S_StartSound(sfx_sorzap, NULL);
+    S_StartSound(SFX_SORZAP, NULL);
 }
 
 void C_DECL A_SorRise(mobj_t *actor)
 {
-    S_StartSound(sfx_sorrise, NULL);
+    S_StartSound(SFX_SORRISE, NULL);
 }
 
 void C_DECL A_SorDSph(mobj_t *actor)
 {
-    S_StartSound(sfx_sordsph, NULL);
+    S_StartSound(SFX_SORDSPH, NULL);
 }
 
 void C_DECL A_SorDExp(mobj_t *actor)
 {
-    S_StartSound(sfx_sordexp, NULL);
+    S_StartSound(SFX_SORDEXP, NULL);
 }
 
 void C_DECL A_SorDBon(mobj_t *actor)
 {
-    S_StartSound(sfx_sordbon, NULL);
+    S_StartSound(SFX_SORDBON, NULL);
 }
 
 void C_DECL A_SorSightSnd(mobj_t *actor)
 {
-    S_StartSound(sfx_sorsit, NULL);
+    S_StartSound(SFX_SORSIT, NULL);
 }
 
 /**
@@ -1405,7 +1405,7 @@
     if(!actor->target)
         return;
 
-    S_StartSound(sfx_stfpow, actor);
+    S_StartSound(SFX_STFPOW, actor);
 
     if(P_CheckMeleeRange(actor))
     {
@@ -1432,7 +1432,7 @@
     if(!target)
         return;
 
-    S_StartSound(sfx_minsit, actor);
+    S_StartSound(SFX_MINSIT, actor);
 
     dist = P_ApproxDistance(actor->pos[VX] - target->pos[VX],
                             actor->pos[VY] - target->pos[VY]);
@@ -1500,7 +1500,7 @@
     if(!actor->target)
         return;
 
-    S_StartSound(sfx_minat2, actor);
+    S_StartSound(SFX_MINAT2, actor);
 
     if(P_CheckMeleeRange(actor))
     {
@@ -1511,7 +1511,7 @@
     mo = P_SpawnMissile(MT_MNTRFX1, actor, actor->target);
     if(mo)
     {
-        S_StartSound(sfx_minat2, mo);
+        S_StartSound(SFX_MINAT2, mo);
 
         momZ = mo->mom[MZ];
         angle = mo->angle;
@@ -1548,7 +1548,7 @@
     {
         mo = P_SpawnMissile(MT_MNTRFX2, actor, actor->target);
         if(mo != NULL)
-            S_StartSound(sfx_minat1, mo);
+            S_StartSound(SFX_MINAT1, mo);
     }
 
     if(P_Random() < 192 && actor->special2 == 0)
@@ -1625,7 +1625,7 @@
     {
         // Ice ball
         P_SpawnMissile(MT_HEADFX1, actor, target);
-        S_StartSound(sfx_hedat2, actor);
+        S_StartSound(SFX_HEDAT2, actor);
     }
     else if(randAttack < atkResolve2[(FLT2FIX(dist) != 0)? 1 : 0])
     {
@@ -1639,7 +1639,7 @@
                 fire = P_SpawnMobj3fv(MT_HEADFX3, baseFire->pos);
 
                 if(i == 0)
-                    S_StartSound(sfx_hedat1, actor);
+                    S_StartSound(SFX_HEDAT1, actor);
 
                 fire->target = baseFire->target;
                 fire->angle = baseFire->angle;
@@ -1665,7 +1665,7 @@
             mo->special2 = 50; // Timer for active sound.
             mo->health = 20 * TICSPERSEC; // Duration.
 
-            S_StartSound(sfx_hedat3, actor);
+            S_StartSound(SFX_HEDAT3, actor);
         }
     }
 }
@@ -1684,7 +1684,7 @@
     if((actor->special2 -= 3) < 0)
     {
         actor->special2 = 58 + (P_Random() & 31);
-        S_StartSound(sfx_hedat3, actor);
+        S_StartSound(SFX_HEDAT3, actor);
     }
 
     if(actor->tracer && actor->tracer->flags & MF_SHADOW)
@@ -1832,7 +1832,7 @@
         if(actor->special1 < 10)
         {
             // Wimpy death sound.
-            S_StartSound(sfx_plrwdth, actor);
+            S_StartSound(SFX_PLRWDTH, actor);
         }
         else if(actor->health > -50)
         {
@@ -1842,12 +1842,12 @@
         else if(actor->health > -100)
         {
             // Crazy death sound.
-            S_StartSound(sfx_plrcdth, actor);
+            S_StartSound(SFX_PLRCDTH, actor);
         }
         else
         {
             // Extreme death sound.
-            S_StartSound(sfx_gibdth, actor);
+            S_StartSound(SFX_GIBDTH, actor);
         }
         break;
 
@@ -2020,7 +2020,7 @@
     P_MobjChangeState(mo, S_POD_GROW1);
     P_ThrustMobj(mo, P_Random() << 24, 4.5f);
 
-    S_StartSound(sfx_newpod, mo);
+    S_StartSound(SFX_NEWPOD, mo);
 
     // Increment generated pod count.
     actor->special1++;
@@ -2128,11 +2128,11 @@
     switch(mo->type)
     {
     case MT_SOUNDWATERFALL:
-        sound = sfx_waterfl;
+        sound = SFX_WATERFL;
         break;
 
     case MT_SOUNDWIND:
-        sound = sfx_wind;
+        sound = SFX_WIND;
         break;
 
     default:
@@ -2230,7 +2230,7 @@
         blast->mom[MY] = 1 * FIX2FLT(finesine[an]);
         blast->mom[MZ] = 2.5f + FIX2FLT(P_Random() << 10);
 
-        S_StartSound(sfx_volsht, blast);
+        S_StartSound(SFX_VOLSHT, blast);
         P_CheckMissileSpawn(blast);
     }
 }
@@ -2339,7 +2339,7 @@
 
 void C_DECL A_FlameSnd(mobj_t *actor)
 {
-    S_StartSound(sfx_hedat1, actor); // Burn sound.
+    S_StartSound(SFX_HEDAT1, actor); // Burn sound.
 }
 
 void C_DECL A_HideThing(mobj_t *actor)

Modified: trunk/doomsday/plugins/jheretic/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_inter.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/p_inter.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -170,7 +170,7 @@
         if(player == &players[CONSOLEPLAYER])
             ST_HUDUnHide(HUE_ON_PICKUP_WEAPON);
 
-        S_ConsoleSound(sfx_wpnup, NULL, player - players);
+        S_ConsoleSound(SFX_WPNUP, NULL, player - players);
         return false;
     }
     else
@@ -376,14 +376,14 @@
         P_MobjChangeState(arti, S_DEADARTI1);
     }
 
-    S_StartSound(sfx_artiup, arti);
+    S_StartSound(SFX_ARTIUP, arti);
 }
 
 void C_DECL A_RestoreArtifact(mobj_t *arti)
 {
     arti->flags |= MF_SPECIAL;
     P_MobjChangeState(arti, arti->info->spawnState);
-    S_StartSound(sfx_respawn, arti);
+    S_StartSound(SFX_RESPAWN, arti);
 }
 
 void P_HideSpecialThing(mobj_t *thing)
@@ -404,7 +404,7 @@
     }
 
     thing->flags2 &= ~MF2_DONTDRAW;
-    S_StartSound(sfx_respawn, thing);
+    S_StartSound(SFX_RESPAWN, thing);
 }
 
 void C_DECL A_RestoreSpecialThing2(mobj_t *thing)
@@ -432,7 +432,7 @@
         return; // Toucher is dead.
     }
 
-    sound = sfx_itemup;
+    sound = SFX_ITEMUP;
     player = toucher->player;
     if(player == NULL)
         return;
@@ -495,7 +495,7 @@
         }
 
         P_GiveKey(player, KT_BLUE);
-        sound = sfx_keyup;
+        sound = SFX_KEYUP;
         if(!IS_NETGAME)
         {
             break;
@@ -508,7 +508,7 @@
             P_SetMessage(player, TXT_GOTYELLOWKEY, false);
         }
 
-        sound = sfx_keyup;
+        sound = SFX_KEYUP;
         P_GiveKey(player, KT_YELLOW);
         if(!IS_NETGAME)
         {
@@ -522,7 +522,7 @@
             P_SetMessage(player, TXT_GOTGREENKEY, false);
         }
 
-        sound = sfx_keyup;
+        sound = SFX_KEYUP;
         P_GiveKey(player, KT_GREEN);
         if(!IS_NETGAME)
         {
@@ -702,7 +702,7 @@
             return;
 
         P_SetMessage(player, TXT_WPNMACE, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_WBOW: // Weapon_Crossbow.
@@ -710,7 +710,7 @@
             return;
 
         P_SetMessage(player, TXT_WPNCROSSBOW, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_WBLS: // Weapon_Blaster.
@@ -718,7 +718,7 @@
             return;
 
         P_SetMessage(player, TXT_WPNBLASTER, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_WSKL: // Weapon_SkullRod.
@@ -726,7 +726,7 @@
             return;
 
         P_SetMessage(player, TXT_WPNSKULLROD, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_WPHX: // Weapon_PhoenixRod.
@@ -734,7 +734,7 @@
             return;
 
         P_SetMessage(player, TXT_WPNPHOENIXROD, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     case SPR_WGNT: // Weapon_Gauntlets.
@@ -742,7 +742,7 @@
             return;
 
         P_SetMessage(player, TXT_WPNGAUNTLETS, false);
-        sound = sfx_wpnup;
+        sound = SFX_WPNUP;
         break;
 
     default:
@@ -934,7 +934,7 @@
     P_MobjChangeState(pmo, S_FREETARGMOBJ);
 
     fog = P_SpawnMobj3f(MT_TFOG, pos[VX], pos[VY], pos[VZ] + TELEFOGHEIGHT);
-    S_StartSound(sfx_telept, fog);
+    S_StartSound(SFX_TELEPT, fog);
 
     chicken = P_SpawnMobj3fv(MT_CHICPLAYER, pos);
     chicken->special1 = player->readyWeapon;
@@ -993,7 +993,7 @@
     P_MobjChangeState(actor, S_FREETARGMOBJ);
 
     fog = P_SpawnMobj3f(MT_TFOG, pos[VX], pos[VY], pos[VZ] + TELEFOGHEIGHT);
-    S_StartSound(sfx_telept, fog);
+    S_StartSound(SFX_TELEPT, fog);
 
     chicken = P_SpawnMobj3fv(MT_CHICKEN, pos);
     chicken->special2 = moType;

Modified: trunk/doomsday/plugins/jheretic/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_mobj.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/p_mobj.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -616,7 +616,7 @@
                 mo->dPlayer->viewHeightDelta = mo->mom[MZ] / 8;
 
                 if(mo->player->health > 0)
-                    S_StartSound(sfx_plroof, mo);
+                    S_StartSound(SFX_PLROOF, mo);
             }
             mo->mom[MZ] = 0;
         }
@@ -679,7 +679,7 @@
                 // Fix DOOM bug - dead players grunting when hitting the ground
                 // (e.g., after an archvile attack)
                 if(mo->player->health > 0)
-                    S_StartSound(sfx_plroof, mo);
+                    S_StartSound(SFX_PLROOF, mo);
             }
 
             P_HitFloor(mo);
@@ -794,14 +794,14 @@
     mo = P_SpawnMobj3f(MT_TFOG, mobj->pos[VX], mobj->pos[VY],
                        P_GetFloatp(mobj->subsector, DMU_FLOOR_HEIGHT) + TELEFOGHEIGHT);
     // Initiate teleport sound.
-    S_StartSound(sfx_telept, mo);
+    S_StartSound(SFX_TELEPT, mo);
 
     // Spawn a teleport fog at the new spot.
     ss = R_PointInSubsector(pos[VX], pos[VY]);
     mo = P_SpawnMobj3f(MT_TFOG, pos[VX], pos[VY],
                        P_GetFloatp(ss, DMU_FLOOR_HEIGHT) + TELEFOGHEIGHT);
 
-    S_StartSound(sfx_telept, mo);
+    S_StartSound(SFX_TELEPT, mo);
 
     if(mobj->info->flags & MF_SPAWNCEILING)
         pos[VZ] = ONCEILINGZ;
@@ -1542,7 +1542,7 @@
             mo->mom[MY] = FIX2FLT((P_Random() - P_Random()) << 8);
             mo->mom[MZ] = 2 + FIX2FLT(P_Random() << 8);
         }
-        S_StartSound(sfx_gloop, mo);
+        S_StartSound(SFX_GLOOP, mo);
         return FLOOR_WATER;
 
     case FLOOR_LAVA:
@@ -1555,7 +1555,7 @@
         {
             mo->mom[MZ] = 1 + FIX2FLT((P_Random() << 7));
         }
-        S_StartSound(sfx_burn, mo);
+        S_StartSound(SFX_BURN, mo);
         return FLOOR_LAVA;
 
     case FLOOR_SLUDGE:
@@ -1878,11 +1878,11 @@
     switch(actor->type)
     {
     case MT_KNIGHTAXE:
-        S_StartSound(sfx_kgtatk, actor);
+        S_StartSound(SFX_KGTATK, actor);
         break;
 
     case MT_MUMMYFX1:
-        S_StartSound(sfx_mumhed, actor);
+        S_StartSound(SFX_MUMHED, actor);
         break;
 
     default:

Modified: trunk/doomsday/plugins/jheretic/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_pspr.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/p_pspr.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -117,7 +117,7 @@
      0,                         // raise sound id
      S_STAFFDOWN2,              // downstate
      S_STAFFREADY2_1,           // readystate
-     sfx_stfcrk,                // readysound
+     SFX_STFCRK,                // readysound
      S_STAFFATK2_1,             // atkstate
      S_STAFFATK2_1,             // holdatkstate
      S_NULL                     // flashstate
@@ -575,7 +575,7 @@
      {0, 0, 0, 0, 0, 0}, // pershot: AT_CRYSTAL | AT_ARROW | etc...
      true,               // autofire when raised if fire held
      S_GAUNTLETUP,              // upstate
-     sfx_gntact,                // raise sound id
+     SFX_GNTACT,                // raise sound id
      S_GAUNTLETDOWN,            // downstate
      S_GAUNTLETREADY,           // readystate
      0,                         // readysound
@@ -590,7 +590,7 @@
      {0, 0, 0, 0, 0, 0}, // pershot: AT_CRYSTAL | AT_ARROW | etc...
      true,               // autofire when raised if fire held
      S_GAUNTLETUP2,             // upstate
-     sfx_gntact,                // raise sound id
+     SFX_GNTACT,                // raise sound id
      S_GAUNTLETDOWN2,           // downstate
      S_GAUNTLETREADY2_1,        // readystate
      0,                         // readysound
@@ -843,7 +843,7 @@
     if(player->readyWeapon == WT_EIGHTH && !player->refire)
     {
         // Play the sound for the initial gauntlet attack
-        S_StartSoundEx(sfx_gntuse, player->plr->mo);
+        S_StartSoundEx(SFX_GNTUSE, player->plr->mo);
     }
 
     player->update |= PSF_AMMO;
@@ -1137,7 +1137,7 @@
                             lineTarget->pos[VX], lineTarget->pos[VY]);
     }
 
-    S_StartSoundEx(sfx_chicpk1 + (P_Random() % 3), player->plr->mo);
+    S_StartSoundEx(SFX_CHICPK1 + (P_Random() % 3), player->plr->mo);
     player->chickenPeck = 12;
     psp->tics -= P_Random() & 7;
 }
@@ -1162,7 +1162,7 @@
                             lineTarget->pos[VX], lineTarget->pos[VY]);
     }
 
-    S_StartSoundEx(sfx_chicpk1 + (P_Random() % 3), player->plr->mo);
+    S_StartSoundEx(SFX_CHICPK1 + (P_Random() % 3), player->plr->mo);
     player->chickenPeck = 12;
     psp->tics -= P_Random() & 3;
 }
@@ -1221,7 +1221,7 @@
     int                 damage;
 
     mo = player->plr->mo;
-    S_StartSoundEx(sfx_gldhit, mo);
+    S_StartSoundEx(SFX_GLDHIT, mo);
     P_ShotAmmo(player);
     P_BulletSlope(mo);
 
@@ -1235,7 +1235,7 @@
     puffType = MT_BLASTERPUFF1;
 
     P_LineAttack(mo, angle, MISSILERANGE, bulletSlope, damage);
-    S_StartSoundEx(sfx_blssht, mo);
+    S_StartSoundEx(SFX_BLSSHT, mo);
 }
 
 void C_DECL A_FireBlasterPL2(player_t* player, pspdef_t* psp)
@@ -1243,7 +1243,7 @@
     mobj_t*             mo;
 
     P_ShotAmmo(player);
-    S_StartSoundEx(sfx_blssht, player->plr->mo);
+    S_StartSoundEx(SFX_BLSSHT, player->plr->mo);
     if(IS_CLIENT)
         return;
 
@@ -1260,7 +1260,7 @@
 
     mo = player->plr->mo;
     P_ShotAmmo(player);
-    S_StartSoundEx(sfx_gldhit, player->plr->mo);
+    S_StartSoundEx(SFX_GLDHIT, player->plr->mo);
     if(IS_CLIENT)
         return;
 
@@ -1285,7 +1285,7 @@
 
     mo = player->plr->mo;
     P_ShotAmmo(player);
-    S_StartSoundEx(sfx_gldhit, player->plr->mo);
+    S_StartSoundEx(SFX_GLDHIT, player->plr->mo);
     if(IS_CLIENT)
         return;
 
@@ -1335,7 +1335,7 @@
         ball->info->speed * FIX2FLT(finesine[an]);
 
     P_CheckMissileSpawn(ball);
-    S_StartSound(sfx_lobsht, ball);
+    S_StartSound(SFX_LOBSHT, ball);
 }
 
 void C_DECL A_FireMacePL1(player_t *player, pspdef_t *psp)
@@ -1404,13 +1404,13 @@
         ball->mom[MZ] = FIX2FLT(FLT2FIX(ball->mom[MZ] * 192) >> 8);
         ball->flags2 &= ~MF2_FLOORBOUNCE;
         P_MobjChangeState(ball, ball->info->spawnState);
-        S_StartSound(sfx_bounce, ball);
+        S_StartSound(SFX_BOUNCE, ball);
     }
     else
     {   // Explode.
         ball->flags |= MF_NOGRAVITY;
         ball->flags2 &= ~MF2_LOGRAV;
-        S_StartSound(sfx_lobhit, ball);
+        S_StartSound(SFX_LOBHIT, ball);
     }
 }
 
@@ -1469,7 +1469,7 @@
     mobj_t             *mo;
 
     P_ShotAmmo(player);
-    S_StartSoundEx(sfx_lobsht, player->plr->mo);
+    S_StartSoundEx(SFX_LOBSHT, player->plr->mo);
     if(IS_CLIENT)
         return;
 
@@ -1546,13 +1546,13 @@
         }
 
         P_MobjChangeState(ball, ball->info->spawnState);
-        S_StartSound(sfx_pstop, ball);
+        S_StartSound(SFX_PSTOP, ball);
     }
     else
     {   // Explode.
         ball->flags |= MF_NOGRAVITY;
         ball->flags2 &= ~MF2_LOGRAV;
-        S_StartSound(sfx_phohit, ball);
+        S_StartSound(SFX_PHOHIT, ball);
     }
 }
 
@@ -1667,7 +1667,7 @@
     if(lineTarget)
         missileMobj->tracer = lineTarget;
 
-    S_StartSound(sfx_hrnpow, missileMobj);
+    S_StartSound(SFX_HRNPOW, missileMobj);
 }
 
 void C_DECL A_SkullRodPL2Seek(mobj_t *actor)
@@ -1777,7 +1777,7 @@
 
     P_CheckMissileSpawn(mo);
     if(!(actor->special1 & 31))
-        S_StartSound(sfx_ramrain, actor);
+        S_StartSound(SFX_RAMRAIN, actor);
 
     actor->special1++;
 }
@@ -1886,7 +1886,7 @@
 
     if(!player->refire || !(levelTime % 38))
     {
-        S_StartSoundEx(sfx_phopow, player->plr->mo);
+        S_StartSoundEx(SFX_PHOPOW, player->plr->mo);
     }
 
     P_CheckMissileSpawn(mo);
@@ -1940,7 +1940,7 @@
             player->plr->extraLight = !player->plr->extraLight;
         }
 
-        S_StartSoundEx(sfx_gntful, player->plr->mo);
+        S_StartSoundEx(SFX_GNTFUL, player->plr->mo);
         return;
     }
 
@@ -1961,11 +1961,11 @@
     if(player->powers[PT_WEAPONLEVEL2])
     {
         P_GiveBody(player, damage / 2);
-        S_StartSoundEx(sfx_gntpow, player->plr->mo);
+        S_StartSoundEx(SFX_GNTPOW, player->plr->mo);
     }
     else
     {
-        S_StartSoundEx(sfx_gnthit, player->plr->mo);
+        S_StartSoundEx(SFX_GNTHIT, player->plr->mo);
     }
 
     // Turn to face target.

Modified: trunk/doomsday/plugins/jheretic/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_spec.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/p_spec.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -815,7 +815,7 @@
         if(cfg.secretMsg)
         {
             P_SetMessage(player, "You've found a secret area!", false);
-            S_ConsoleSound(sfx_wpnup, 0, player - players);
+            S_ConsoleSound(SFX_WPNUP, 0, player - players);
         }
         break;
 
@@ -937,7 +937,7 @@
                               (int) button->section);
                 }
 
-                S_StartSound(sfx_switch,
+                S_StartSound(SFX_SWITCH,
                              P_GetPtrp(frontsector, DMU_SOUND_ORIGIN));
 
                 button->line = NULL;
@@ -1151,110 +1151,110 @@
     afxcmd_end
 };
 int     AmbSndSeq1[] = {        // Scream
-    afxcmd_play, sfx_amb1,
+    afxcmd_play, SFX_AMB1,
     afxcmd_end
 };
 int     AmbSndSeq2[] = {        // Squish
-    afxcmd_play, sfx_amb2,
+    afxcmd_play, SFX_AMB2,
     afxcmd_end
 };
 int     AmbSndSeq3[] = {        // Drops
-    afxcmd_play, sfx_amb3,
+    afxcmd_play, SFX_AMB3,
     afxcmd_delay, 16,
     afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb7,
+    afxcmd_play, SFX_AMB7,
     afxcmd_delay, 16,
     afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb3,
+    afxcmd_play, SFX_AMB3,
     afxcmd_delay, 16,
     afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb7,
+    afxcmd_play, SFX_AMB7,
     afxcmd_delay, 16,
     afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb3,
+    afxcmd_play, SFX_AMB3,
     afxcmd_delay, 16,
     afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb7,
+    afxcmd_play, SFX_AMB7,
     afxcmd_delay, 16,
     afxcmd_delayrand, 31,
     afxcmd_end
 };
 int     AmbSndSeq4[] = {        // SlowFootSteps
-    afxcmd_play, sfx_amb4,
+    afxcmd_play, SFX_AMB4,
     afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_playrelvol, SFX_AMB11, -3,
     afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_playrelvol, SFX_AMB4, -3,
     afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_playrelvol, SFX_AMB11, -3,
     afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_playrelvol, SFX_AMB4, -3,
     afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_playrelvol, SFX_AMB11, -3,
     afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_playrelvol, SFX_AMB4, -3,
     afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_playrelvol, SFX_AMB11, -3,
     afxcmd_end
 };
 int     AmbSndSeq5[] = {        // Heartbeat
-    afxcmd_play, sfx_amb5,
+    afxcmd_play, SFX_AMB5,
     afxcmd_delay, 35,
-    afxcmd_play, sfx_amb5,
+    afxcmd_play, SFX_AMB5,
     afxcmd_delay, 35,
-    afxcmd_play, sfx_amb5,
+    afxcmd_play, SFX_AMB5,
     afxcmd_delay, 35,
-    afxcmd_play, sfx_amb5,
+    afxcmd_play, SFX_AMB5,
     afxcmd_end
 };
 int     AmbSndSeq6[] = {        // Bells
-    afxcmd_play, sfx_amb6,
+    afxcmd_play, SFX_AMB6,
     afxcmd_delay, 17,
-    afxcmd_playrelvol, sfx_amb6, -8,
+    afxcmd_playrelvol, SFX_AMB6, -8,
     afxcmd_delay, 17,
-    afxcmd_playrelvol, sfx_amb6, -8,
+    afxcmd_playrelvol, SFX_AMB6, -8,
     afxcmd_delay, 17,
-    afxcmd_playrelvol, sfx_amb6, -8,
+    afxcmd_playrelvol, SFX_AMB6, -8,
     afxcmd_end
 };
 int     AmbSndSeq7[] = {        // Growl
-    afxcmd_play, sfx_bstsit,
+    afxcmd_play, SFX_BSTSIT,
     afxcmd_end
 };
 int     AmbSndSeq8[] = {        // Magic
-    afxcmd_play, sfx_amb8,
+    afxcmd_play, SFX_AMB8,
     afxcmd_end
 };
 int     AmbSndSeq9[] = {        // Laughter
-    afxcmd_play, sfx_amb9,
+    afxcmd_play, SFX_AMB9,
     afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb9, -4,
+    afxcmd_playrelvol, SFX_AMB9, -4,
     afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb9, -4,
+    afxcmd_playrelvol, SFX_AMB9, -4,
     afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb10, -4,
+    afxcmd_playrelvol, SFX_AMB10, -4,
     afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb10, -4,
+    afxcmd_playrelvol, SFX_AMB10, -4,
     afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb10, -4,
+    afxcmd_playrelvol, SFX_AMB10, -4,
     afxcmd_end
 };
 int     AmbSndSeq10[] = {       // FastFootsteps
-    afxcmd_play, sfx_amb4,
+    afxcmd_play, SFX_AMB4,
     afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_playrelvol, SFX_AMB11, -3,
     afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_playrelvol, SFX_AMB4, -3,
     afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_playrelvol, SFX_AMB11, -3,
     afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_playrelvol, SFX_AMB4, -3,
     afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_playrelvol, SFX_AMB11, -3,
     afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_playrelvol, SFX_AMB4, -3,
     afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_playrelvol, SFX_AMB11, -3,
     afxcmd_end
 };
 

Modified: trunk/doomsday/plugins/jheretic/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_telept.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/p_telept.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -137,7 +137,7 @@
         // Spawn teleport fog at source and destination
         fogDelta = thing->flags & MF_MISSILE? 0 : TELEFOGHEIGHT;
         fog = P_SpawnMobj3f(MT_TFOG, oldpos[VX], oldpos[VY], oldpos[VZ] + fogDelta);
-        S_StartSound(sfx_telept, fog);
+        S_StartSound(SFX_TELEPT, fog);
 
         an = angle >> ANGLETOFINESHIFT;
         fog =
@@ -145,7 +145,7 @@
                           x + 20 * FIX2FLT(finecosine[an]),
                           y + 20 * FIX2FLT(finesine[an]),
                           thing->pos[VZ] + fogDelta);
-        S_StartSound(sfx_telept, fog);
+        S_StartSound(SFX_TELEPT, fog);
     }
 
     if(thing->player && !thing->player->powers[PT_WEAPONLEVEL2])
@@ -286,12 +286,12 @@
     {   // Teleporting away will undo any morph effects (pig)
         P_UndoPlayerMorph(player);
     }
-    //S_StartSound(NULL, sfx_wpnup); // Full volume laugh
+    //S_StartSound(NULL, SFX_WPNUP); // Full volume laugh
 # else
     P_Teleport(player->plr->mo, destPos[VX], destPos[VY], destAngle, true);
-    /*S_StartSound(sfx_wpnup, NULL); // Full volume laugh
-       NetSv_Sound(NULL, sfx_wpnup, player-players); */
-    S_StartSound(sfx_wpnup, NULL);
+    /*S_StartSound(SFX_WPNUP, NULL); // Full volume laugh
+       NetSv_Sound(NULL, SFX_WPNUP, player-players); */
+    S_StartSound(SFX_WPNUP, NULL);
 # endif
 }
 #endif

Modified: trunk/doomsday/plugins/jheretic/src/st_stuff.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/st_stuff.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jheretic/src/st_stuff.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -774,7 +774,7 @@
         if(tomePlay != timeleft)
         {
             tomePlay = timeleft;
-            S_LocalSound(sfx_keyup, NULL);
+            S_LocalSound(SFX_KEYUP, NULL);
         }
     }
 

Modified: trunk/doomsday/plugins/jhexen/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_telept.c	2008-05-31 06:00:16 UTC (rev 5685)
+++ trunk/doomsday/plugins/jhexen/src/p_telept.c	2008-05-31 09:41:58 UTC (rev 5686)
@@ -329,7 +329,7 @@
 
 # else
     P_Teleport(player->plr->mo, destPos[VX], destPos[VY], destAngle);
-    S_StartSound(sfx_wpnup, NULL);
+    S_StartSound(SFX_WPNUP, NULL);
 # endif
 }
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5708
          http://deng.svn.sourceforge.net/deng/?rev=5708&view=rev
Author:   danij
Date:     2008-06-13 17:14:40 -0700 (Fri, 13 Jun 2008)

Log Message:
-----------
Stripped out everything to do with DOOM2's IOS boss from jDoom64, as it isn't in the game.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/src/hu_menu.c
    trunk/doomsday/plugins/common/src/p_map.c
    trunk/doomsday/plugins/common/src/p_mapsetup.c
    trunk/doomsday/plugins/jdoom64/defs/audio.ded
    trunk/doomsday/plugins/jdoom64/defs/d2_ogg_Audio.ded
    trunk/doomsday/plugins/jdoom64/defs/objects.ded
    trunk/doomsday/plugins/jdoom64/defs/sprites.ded
    trunk/doomsday/plugins/jdoom64/include/acfnlink.h
    trunk/doomsday/plugins/jdoom64/include/info.h
    trunk/doomsday/plugins/jdoom64/include/p_enemy.h
    trunk/doomsday/plugins/jdoom64/include/sndidx.h
    trunk/doomsday/plugins/jdoom64/src/acfnlink.c
    trunk/doomsday/plugins/jdoom64/src/p_enemy.c

Modified: trunk/doomsday/plugins/common/src/hu_menu.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_menu.c	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/common/src/hu_menu.c	2008-06-14 00:14:40 UTC (rev 5708)
@@ -3412,7 +3412,11 @@
     static int  quitsounds2[8] = {
         SFX_VILACT,
         SFX_GETPOW,
+# if __JDOOM64__
+        SFX_PEPAIN,
+# else
         SFX_BOSCUB,
+# endif
         SFX_SLOP,
         SFX_SKESWG,
         SFX_KNTDTH,

Modified: trunk/doomsday/plugins/common/src/p_map.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_map.c	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/common/src/p_map.c	2008-06-14 00:14:40 UTC (rev 5708)
@@ -1964,8 +1964,12 @@
        thing->type == MT_SORCERER2)
         return true;
 #elif __JDOOM__ || __JDOOM64__
-    if(thing->type == MT_CYBORG || thing->type == MT_SPIDER)
+    if(thing->type == MT_CYBORG)
         return true;
+# if __JDOOM__
+    if(thing->type == MT_SPIDER)
+        return true;
+# endif
 #else
     if(!damageSource && thing == bombSource) // Don't damage the source of the explosion.
         return true;

Modified: trunk/doomsday/plugins/common/src/p_mapsetup.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_mapsetup.c	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/common/src/p_mapsetup.c	2008-06-14 00:14:40 UTC (rev 5708)
@@ -516,7 +516,9 @@
 
     // Only used with 666/7 specials
     bossKilled = false;
+#endif
 
+#if __JDOOM__
     // Brain info
     numBrainTargets = 0;
     numBrainTargetsAlloc = -1;

Modified: trunk/doomsday/plugins/jdoom64/defs/audio.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/audio.ded	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/defs/audio.ded	2008-06-14 00:14:40 UTC (rev 5708)
@@ -989,56 +989,6 @@
 }
 
 Sound {
-  ID = "bospit";
-  Flags = "sf_shift2";
-  Lump = "DSBOSPIT";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "boscub";
-  Flags = "sf_shift2";
-  Lump = "DSBOSCUB";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "bossit";
-  Flags = "sf_shift2";
-  Lump = "DSBOSSIT";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "bospn";
-  Flags = "sf_shift2";
-  Lump = "DSBOSPN";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "bosdth";
-  Flags = "sf_shift2";
-  Lump = "DSBOSDTH";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
   ID = "manatk";
   Flags = "sf_shift2";
   Lump = "DSMANATK";

Modified: trunk/doomsday/plugins/jdoom64/defs/d2_ogg_Audio.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/d2_ogg_Audio.ded	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/defs/d2_ogg_Audio.ded	2008-06-14 00:14:40 UTC (rev 5708)
@@ -996,56 +996,6 @@
 }
 
 Sound {
-  ID = "bospit";
-  Flags = "sf_shift2";
-  Lump = "DSBOSPIT";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "boscub";
-  Flags = "sf_shift2";
-  Lump = "DSBOSCUB";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "bossit";
-  Flags = "sf_shift2";
-  Lump = "DSBOSSIT";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "bospn";
-  Flags = "sf_shift2";
-  Lump = "DSBOSPN";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "bosdth";
-  Flags = "sf_shift2";
-  Lump = "DSBOSDTH";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
   ID = "manatk";
   Flags = "sf_shift2";
   Lump = "DSMANATK";

Modified: trunk/doomsday/plugins/jdoom64/defs/objects.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/objects.ded	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/defs/objects.ded	2008-06-14 00:14:40 UTC (rev 5708)
@@ -637,81 +637,6 @@
 }
 
 Thing {
-  ID = "BOSSSPIT";
-  DoomEd number = 89;
-  Spawn state = "BRAINEYE";
-  See state = "BRAINEYESEE";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 32;
-  Mass = 100;
-  Flags = "mf_noblockmap mf_nosector";
-}
-
-Thing {
-  ID = "BOSSTARGET";
-  DoomEd number = 87;
-  Spawn state = "NULL";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 32;
-  Mass = 100;
-  Flags = "mf_noblockmap mf_nosector";
-}
-
-Thing {
-  ID = "BOSSSHOT";
-  DoomEd number = -1;
-  Spawn state = "SPAWN1";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "bospit";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Speed = 10;
-  Radius = 6;
-  Height = 32;
-  Mass = 100;
-  Damage = 3;
-  Flags = "mf_noblockmap mf_spawnceiling mf_dropoff mf_nogravity mf_noclip";
-  Flags2 = "mf2_cannotpush mf2_noteleport";
-}
-
-Thing {
   ID = "BARREL";
   DoomEd number = 2035;
   Spawn state = "BAR1";
@@ -12612,148 +12537,6 @@
 }
 
 State {
-  ID = "BRAIN";
-  Sprite = "BLNK";
-  Frame = 0;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
-  ID = "BRAIN_PAIN";
-  Sprite = "BBRN";
-  Frame = 1;
-  Tics = 36;
-  Action = "A_BrainPain";
-  Next state = "BRAIN";
-}
-
-State {
-  ID = "BRAIN_DIE1";
-  Sprite = "BBRN";
-  Frame = 0;
-  Tics = 100;
-  Action = "A_BrainScream";
-  Next state = "BRAIN_DIE2";
-}
-
-State {
-  ID = "BRAIN_DIE2";
-  Sprite = "BBRN";
-  Frame = 0;
-  Tics = 10;
-  Next state = "BRAIN_DIE3";
-}
-
-State {
-  ID = "BRAIN_DIE3";
-  Sprite = "BBRN";
-  Frame = 0;
-  Tics = 10;
-  Next state = "BRAIN_DIE4";
-}
-
-State {
-  ID = "BRAIN_DIE4";
-  Sprite = "BBRN";
-  Frame = 0;
-  Tics = -1;
-  Action = "A_BrainDie";
-  Next state = "NULL";
-}
-
-State {
-  ID = "BRAINEYE";
-  Sprite = "SSWV";
-  Frame = 0;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "BRAINEYE";
-}
-
-State {
-  ID = "BRAINEYESEE";
-  Sprite = "SSWV";
-  Frame = 0;
-  Tics = 181;
-  Action = "A_BrainAwake";
-  Next state = "BRAINEYE1";
-}
-
-State {
-  ID = "BRAINEYE1";
-  Sprite = "SSWV";
-  Frame = 0;
-  Tics = 150;
-  Action = "A_BrainSpit";
-  Next state = "BRAINEYE1";
-}
-
-State {
-  ID = "SPAWN1";
-  Sprite = "BOSF";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 3;
-  Next state = "SPAWN2";
-}
-
-State {
-  ID = "SPAWN2";
-  Sprite = "BOSF";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 3;
-  Next state = "SPAWN3";
-}
-
-State {
-  ID = "SPAWN3";
-  Sprite = "BOSF";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 3;
-  Next state = "SPAWN4";
-}
-
-State {
-  ID = "SPAWN4";
-  Sprite = "BOSF";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 3;
-  Next state = "SPAWN1";
-}
-
-State {
-  ID = "BRAINEXPLODE1";
-  Sprite = "MISL";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 10;
-  Next state = "BRAINEXPLODE2";
-}
-
-State {
-  ID = "BRAINEXPLODE2";
-  Sprite = "MISL";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 10;
-  Next state = "BRAINEXPLODE3";
-}
-
-State {
-  ID = "BRAINEXPLODE3";
-  Sprite = "MISL";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 10;
-  Action = "A_BrainExplode";
-  Next state = "NULL";
-}
-
-State {
   ID = "ARM1";
   Sprite = "ARM1";
   Frame = 0;

Modified: trunk/doomsday/plugins/jdoom64/defs/sprites.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/sprites.ded	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/defs/sprites.ded	2008-06-14 00:14:40 UTC (rev 5708)
@@ -97,9 +97,6 @@
 Sprite { ID = "BAL7"; }
 Sprite { ID = "BOS2"; }
 Sprite { ID = "APBX"; }
-Sprite { ID = "SSWV"; }
-Sprite { ID = "BBRN"; }
-Sprite { ID = "BOSF"; }
 Sprite { ID = "BEXP"; }
 Sprite { ID = "FCAN"; }
 Sprite { ID = "BON3"; }

Modified: trunk/doomsday/plugins/jdoom64/include/acfnlink.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/acfnlink.h	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/include/acfnlink.h	2008-06-14 00:14:40 UTC (rev 5708)
@@ -48,12 +48,6 @@
 void C_DECL A_BFGsound();
 void C_DECL A_BFGSpray();
 void C_DECL A_BossDeath();
-void C_DECL A_BrainAwake();
-void C_DECL A_BrainDie();
-void C_DECL A_BrainExplode();
-void C_DECL A_BrainPain();
-void C_DECL A_BrainScream();
-void C_DECL A_BrainSpit();
 void C_DECL A_BruisAttack();
 void C_DECL A_BspiAttack();
 void C_DECL A_Chase();
@@ -102,8 +96,6 @@
 void C_DECL A_SkelMissile();
 void C_DECL A_SkelWhoosh();
 void C_DECL A_SkullAttack();
-void C_DECL A_SpawnFly();
-void C_DECL A_SpawnSound();
 void C_DECL A_SpidRefire();
 void C_DECL A_SPosAttack();
 void C_DECL A_Tracer();

Modified: trunk/doomsday/plugins/jdoom64/include/info.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/info.h	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/include/info.h	2008-06-14 00:14:40 UTC (rev 5708)
@@ -187,9 +187,6 @@
     SPR_BAL7,
     SPR_BOS2,
     SPR_APBX,
-    SPR_SSWV, // Currently used for the brain.
-    SPR_BBRN,
-    SPR_BOSF,
     SPR_BEXP,
     SPR_FCAN,
     SPR_BON3,
@@ -1015,22 +1012,6 @@
     S_PAIN_RAISE4,
     S_PAIN_RAISE5,
     S_PAIN_RAISE6,
-    S_BRAIN,
-    S_BRAIN_PAIN,
-    S_BRAIN_DIE1,
-    S_BRAIN_DIE2,
-    S_BRAIN_DIE3,
-    S_BRAIN_DIE4,
-    S_BRAINEYE,
-    S_BRAINEYESEE,
-    S_BRAINEYE1,
-    S_SPAWN1,
-    S_SPAWN2,
-    S_SPAWN3,
-    S_SPAWN4,
-    S_BRAINEXPLODE1,
-    S_BRAINEXPLODE2,
-    S_BRAINEXPLODE3,
     S_ARM1,
     S_ARM1A,
     S_ARM2,
@@ -1364,9 +1345,6 @@
     MT_CYBORG,
     MT_PAIN,
     MT_EMARINER,
-    MT_BOSSSPIT,
-    MT_BOSSTARGET,
-    MT_BOSSSHOT,
     MT_BARREL,
     MT_TROOPSHOT,
     MT_HEADSHOT,

Modified: trunk/doomsday/plugins/jdoom64/include/p_enemy.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/p_enemy.h	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/include/p_enemy.h	2008-06-14 00:14:40 UTC (rev 5708)
@@ -32,19 +32,6 @@
 #  error "Using jDoom64 headers without __JDOOM64__"
 #endif
 
-/**
- * Global state of boss brain.
- */
-typedef struct braindata_s {
-    int             easy;
-    int             targetOn;
-} braindata_t;
-
-extern braindata_t brain;
-extern mobj_t **brainTargets;
-extern int numBrainTargets;
-extern int numBrainTargetsAlloc;
-
 extern boolean bossKilled;
 
 void        P_SpawnBrainTargets(void);

Modified: trunk/doomsday/plugins/jdoom64/include/sndidx.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/sndidx.h	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/include/sndidx.h	2008-06-14 00:14:40 UTC (rev 5708)
@@ -126,11 +126,6 @@
     SFX_FLAME,                     // 091
     SFX_FLAMST,                    // 092
     SFX_GETPOW,                    // 093
-    SFX_BOSPIT,                    // 094
-    SFX_BOSCUB,                    // 095
-    SFX_BOSSIT,                    // 096
-    SFX_BOSPN,                     // 097
-    SFX_BOSDTH,                    // 098
     SFX_MANATK,                    // 099
     SFX_MANDTH,                    // 100
     SFX_SSSIT,                     // 101

Modified: trunk/doomsday/plugins/jdoom64/src/acfnlink.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/acfnlink.c	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/src/acfnlink.c	2008-06-14 00:14:40 UTC (rev 5708)
@@ -47,12 +47,6 @@
     {"A_BFGsound",          A_BFGsound},
     {"A_BFGSpray",          A_BFGSpray},
     {"A_BossDeath",         A_BossDeath},
-    {"A_BrainAwake",        A_BrainAwake},
-    {"A_BrainDie",          A_BrainDie},
-    {"A_BrainExplode",      A_BrainExplode},
-    {"A_BrainPain",         A_BrainPain},
-    {"A_BrainScream",       A_BrainScream},
-    {"A_BrainSpit",         A_BrainSpit},
     {"A_BruisAttack",       A_BruisAttack},
     {"A_BruisredAttack",    A_BruisredAttack}, //jd64
     {"A_BspiAttack",        A_BspiAttack},
@@ -127,8 +121,6 @@
     {"A_SkelMissile",       A_SkelMissile},
     {"A_SkelWhoosh",        A_SkelWhoosh},
     {"A_SkullAttack",       A_SkullAttack},
-    {"A_SpawnFly",          A_SpawnFly},
-    {"A_SpawnSound",        A_SpawnSound},
     {"A_SpidRefire",        A_SpidRefire},
     {"A_SPosAttack",        A_SPosAttack},
     {"A_Tracer",            A_Tracer},

Modified: trunk/doomsday/plugins/jdoom64/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_enemy.c	2008-06-13 23:40:20 UTC (rev 5707)
+++ trunk/doomsday/plugins/jdoom64/src/p_enemy.c	2008-06-14 00:14:40 UTC (rev 5708)
@@ -98,11 +98,6 @@
 
 boolean bossKilled;
 
-mobj_t **brainTargets;
-int numBrainTargets;
-int numBrainTargetsAlloc;
-braindata_t brain; // Global state of boss brain.
-
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
 static mobj_t *corpseHit;
@@ -565,51 +560,6 @@
     return count;
 }
 
-
-static boolean findBrainTarget(thinker_t* th, void* context)
-{
-    mobj_t*             mo = (mobj_t *) th;
-
-    if(mo->type == MT_BOSSTARGET)
-    {
-        if(numBrainTargets >= numBrainTargetsAlloc)
-        {
-            // Do we need to alloc more targets?
-            if(numBrainTargets == numBrainTargetsAlloc)
-            {
-                numBrainTargetsAlloc *= 2;
-                brainTargets =
-                    Z_Realloc(brainTargets,
-                              numBrainTargetsAlloc * sizeof(*brainTargets),
-                              PU_LEVEL);
-            }
-            else
-            {
-                numBrainTargetsAlloc = 32;
-                brainTargets =
-                    Z_Malloc(numBrainTargetsAlloc * sizeof(*brainTargets),
-                             PU_LEVEL, NULL);
-            }
-        }
-
-        brainTargets[numBrainTargets++] = mo;
-    }
-
-    return true; // Continue iteration.
-}
-
-/**
- * Initialize boss brain targets at level startup, rather than at boss
- * wakeup, to prevent savegame-related crashes.
- *
- * \todo Does not belong in this file, find it a better home.
- */
-void P_SpawnBrainTargets(void)
-{
-    // Find all the target spots.
-    P_IterateThinkers(P_MobjThinker, findBrainTarget, NULL);
-}
-
 typedef struct {
     mobjtype_t          type;
     size_t              count;
@@ -2422,153 +2372,6 @@
     A_Chase(mo);
 }
 
-void C_DECL A_BrainAwake(mobj_t *mo)
-{
-    S_StartSound(SFX_BOSSIT, NULL);
-}
-
-void C_DECL A_BrainPain(mobj_t *mo)
-{
-    S_StartSound(SFX_BOSPN, NULL);
-}
-
-void C_DECL A_BrainScream(mobj_t *mo)
-{
-    float               pos[3];
-    mobj_t             *th;
-
-    for(pos[VX] = mo->pos[VX] - 196; pos[VX] < mo->pos[VX] + 320;
-        pos[VX] += 8)
-    {
-        pos[VY] = mo->pos[VY] - 320;
-        pos[VZ] = 128 + (P_Random() * 2);
-
-        th = P_SpawnMobj3fv(MT_ROCKET, pos);
-        th->mom[MZ] = FIX2FLT(P_Random() * 512);
-
-        P_MobjChangeState(th, S_BRAINEXPLODE1);
-
-        th->tics -= P_Random() & 7;
-        if(th->tics < 1)
-            th->tics = 1;
-    }
-
-    S_StartSound(SFX_BOSDTH, NULL);
-}
-
-void C_DECL A_BrainExplode(mobj_t *mo)
-{
-    float               pos[3];
-    mobj_t             *th;
-
-    pos[VX] = mo->pos[VX] + ((P_Random() - P_Random()) * 2048);
-    pos[VY] = mo->pos[VY];
-    pos[VZ] = 128 + (P_Random() * 2);
-
-    th = P_SpawnMobj3fv(MT_ROCKET, pos);
-    th->mom[MZ] = FIX2FLT(P_Random() * 512);
-
-    P_MobjChangeState(th, S_BRAINEXPLODE1);
-
-    th->tics -= P_Random() & 7;
-    if(th->tics < 1)
-        th->tics = 1;
-}
-
-void C_DECL A_BrainDie(mobj_t *mo)
-{
-    G_LeaveLevel(G_GetLevelNumber(gameEpisode, gameMap), 0, false);
-}
-
-/**
- * Unused?
- */
-void C_DECL A_BrainSpit(mobj_t *mo)
-{
-/*
-    mobj_t             *targ;
-    mobj_t             *newmobj;
-
-    if(!numBrainTargets)
-        return; // Ignore if no targets.
-
-    brain.easy ^= 1;
-    if(gameSkill <= SM_EASY && (!brain.easy))
-        return;
-
-    // Shoot a cube at current target.
-    targ = brainTargets[brain.targetOn++];
-    brain.targetOn %= numBrainTargets;
-
-    // Spawn brain missile.
-    newmobj = P_SpawnMissile(MT_SPAWNSHOT, mo, targ);
-    if(newmobj)
-    {
-        newmobj->target = targ;
-        newmobj->reactionTime =
-            ((targ->pos[VY] - mo->pos[VY]) / newmobj->mom[MY]) / newmobj->state->tics;
-    }
-
-    S_StartSound(sfx_bospit, NULL);
-*/
-}
-
-/**
- * Travelling cube sound.
- */
-void C_DECL A_SpawnSound(mobj_t *mo)
-{
-    S_StartSound(SFX_BOSCUB, mo);
-    A_SpawnFly(mo);
-}
-
-void C_DECL A_SpawnFly(mobj_t *mo)
-{
-    int                 r;
-    mobj_t             *newmobj;
-    mobj_t             *targ;
-    mobjtype_t          type;
-
-    if(--mo->reactionTime)
-        return; // Still flying.
-
-    targ = mo->target;
-
-    // Randomly select monster to spawn.
-    r = P_Random();
-
-    // Probability distribution (kind of :), decreasing likelihood.
-    if(r < 50)
-        type = MT_TROOP;
-    else if(r < 90)
-        type = MT_SERGEANT;
-    else if(r < 120)
-        type = MT_SHADOWS;
-    else if(r < 130)
-        type = MT_PAIN;
-    else if(r < 160)
-        type = MT_HEAD;
-    else if(r < 192)
-        type = MT_BABY;
-    else if(r < 222)
-        type = MT_FATSO;
-    else if(r < 246)
-        type = MT_KNIGHT;
-    else
-        type = MT_BRUISER;
-
-    newmobj = P_SpawnMobj3fv(type, targ->pos);
-
-    if(lookForPlayers(newmobj, true))
-        P_MobjChangeState(newmobj, newmobj->info->seeState);
-
-    // Telefrag anything in this spot.
-    P_TeleportMove(newmobj, newmobj->pos[VX], newmobj->pos[VY], false);
-
-    // Remove self (i.e., cube).
-    P_MobjRemove(mo, true);
-}
-
 void C_DECL A_PlayerScream(mobj_t *mo)
 {
     int                 sound = SFX_PLDETH; // Default death sound.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5709
          http://deng.svn.sourceforge.net/deng/?rev=5709&view=rev
Author:   danij
Date:     2008-06-13 19:15:34 -0700 (Fri, 13 Jun 2008)

Log Message:
-----------
Stripped out a bunch more stuff from jDoom64 that had never been fully implemented in Doom64TC (destined for Outcast?). Stripped out the Chaingun Guy, a few decorations and items that are not in DOOM64.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/src/p_player.c
    trunk/doomsday/plugins/jdoom64/defs/audio.ded
    trunk/doomsday/plugins/jdoom64/defs/d2_ogg_Audio.ded
    trunk/doomsday/plugins/jdoom64/defs/objects.ded
    trunk/doomsday/plugins/jdoom64/defs/particles.ded
    trunk/doomsday/plugins/jdoom64/defs/sprites.ded
    trunk/doomsday/plugins/jdoom64/defs/text.ded
    trunk/doomsday/plugins/jdoom64/include/acfnlink.h
    trunk/doomsday/plugins/jdoom64/include/d_englsh.h
    trunk/doomsday/plugins/jdoom64/include/info.h
    trunk/doomsday/plugins/jdoom64/include/sndidx.h
    trunk/doomsday/plugins/jdoom64/src/acfnlink.c
    trunk/doomsday/plugins/jdoom64/src/p_enemy.c
    trunk/doomsday/plugins/jdoom64/src/p_inter.c
    trunk/doomsday/plugins/jdoom64/src/p_mobj.c
    trunk/doomsday/plugins/jdoom64/src/p_telept.c

Modified: trunk/doomsday/plugins/common/src/p_player.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_player.c	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/common/src/p_player.c	2008-06-14 02:15:34 UTC (rev 5709)
@@ -865,7 +865,7 @@
 
 #if __JDOOM64__
     // jd64 > kaiser - another cheesy hack!!!
-    if(mo->type == MT_DART || mo->type == MT_RDART)
+    if(mo->type == MT_DART)
     {
         S_StartSound(SFX_SKESWG, mo); // We got darts! spawn skeswg sound!
     }

Modified: trunk/doomsday/plugins/jdoom64/defs/audio.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/audio.ded	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/defs/audio.ded	2008-06-14 02:15:34 UTC (rev 5709)
@@ -500,16 +500,6 @@
 }
 
 Sound {
-  ID = "spisit";
-  Flags = "sf_shift2";
-  Lump = "DSSPISIT";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 90;
-  Max channels = 1;
-}
-
-Sound {
   ID = "bspsit";
   Flags = "sf_shift2";
   Lump = "DSBSPSIT";
@@ -740,16 +730,6 @@
 }
 
 Sound {
-  ID = "spidth";
-  Flags = "sf_shift2";
-  Lump = "DSSPIDTH";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 32;
-  Max channels = -1;
-}
-
-Sound {
   ID = "bspdth";
   Flags = "sf_shift2";
   Lump = "DSBSPDTH";
@@ -1132,36 +1112,6 @@
 }
 
 Sound {
-  ID = "stlkst";
-  Flags = "sf_shift2";
-  Lump = "DSSTLKST";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "stlkpn";
-  Flags = "sf_shift2";
-  Lump = "DSSTLKPN";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 70;
-  Max channels = -1;
-}
-
-Sound {
-  ID = "stlktp";
-  Flags = "sf_shift2";
-  Lump = "DSSTLKTP";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 32;
-  Max channels = -1;
-}
-
-Sound {
   ID = "htime";
   Flags = "sf_shift2";
   Lump = "DSHTIME";

Modified: trunk/doomsday/plugins/jdoom64/defs/d2_ogg_Audio.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/d2_ogg_Audio.ded	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/defs/d2_ogg_Audio.ded	2008-06-14 02:15:34 UTC (rev 5709)
@@ -507,16 +507,6 @@
 }
 
 Sound {
-  ID = "spisit";
-  Flags = "sf_shift2";
-  Lump = "DSSPISIT";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 90;
-  Max channels = 1;
-}
-
-Sound {
   ID = "bspsit";
   Flags = "sf_shift2";
   Lump = "DSBSPSIT";
@@ -747,16 +737,6 @@
 }
 
 Sound {
-  ID = "spidth";
-  Flags = "sf_shift2";
-  Lump = "DSSPIDTH";
-  Link pitch = -1;
-  Link volume = -1;
-  Priority = 32;
-  Max channels = -1;
-}
-
-Sound {
   ID = "bspdth";
   Flags = "sf_shift2";
   Lump = "DSBSPDTH";

Modified: trunk/doomsday/plugins/jdoom64/defs/objects.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/objects.ded	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/defs/objects.ded	2008-06-14 02:15:34 UTC (rev 5709)
@@ -951,31 +951,6 @@
 }
 
 Thing {
-  ID = "HFOG";
-  DoomEd number =-1;
-  Spawn state = "HFOG";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "stlktp";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_noblockmap mf_nogravity";
-  Flags2 = "mf2_cannotpush mf2_noteleport";
-}
-
-Thing {
   ID = "TELEPORTMAN";
   DoomEd number = 14;
   Spawn state = "NULL";
@@ -2090,81 +2065,6 @@
 }
 
 Thing {
-  ID = "MISC37";
-  DoomEd number = 36;
-  Spawn state = "HEARTCOL";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 16;
-  Height = 40;
-  Mass = 100;
-  Flags = "mf_solid mf_local";
-  Flags2 = "mf2_telestomp";
-}
-
-Thing {
-  ID = "MR.RAIN";
-  DoomEd number = 41;
-  Spawn state = "EVILEYE";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 16;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_noblockmap mf_spawnceiling mf_nogravity mf_noclip";
-  Flags2 = "mf2_telestomp";
-}
-
-Thing {
-  ID = "MISC39";
-  DoomEd number = 42;
-  Spawn state = "FLOATSKULL";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 16;
-  Height = 35;
-  Mass = 100;
-  Flags = "mf_solid mf_local";
-  Flags2 = "mf2_telestomp";
-}
-
-Thing {
   ID = "MISC40";
   DoomEd number = 43;
   Spawn state = "TORCHTREE";
@@ -2675,167 +2575,6 @@
 }
 
 Thing {
-  ID = "MISC61";
-  DoomEd number = 22;
-  Spawn state = "HEAD_DIE6";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-}
-
-Thing {
-  ID = "MISC62";
-  DoomEd number = 15;
-  Spawn state = "PLAY_DIE7";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-}
-
-Thing {
-  ID = "MISC63";
-  DoomEd number = 18;
-  Spawn state = "POSS_DIE5";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-}
-
-Thing {
-  ID = "MISC64";
-  DoomEd number = 21;
-  Spawn state = "SARG_DIE6";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-}
-
-Thing {
-  ID = "MISC65";
-  DoomEd number = 23;
-  Spawn state = "SKULL_DIE6";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-}
-
-Thing {
-  ID = "MISC66";
-  DoomEd number = 20;
-  Spawn state = "TROO_DIE5";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-}
-
-Thing {
-  ID = "MISC67";
-  DoomEd number = 19;
-  Spawn state = "SPOS_DIE5";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-}
-
-Thing {
   ID = "MISC68";
   DoomEd number = 10;
   Spawn state = "PLAY_XDIE9";
@@ -3053,31 +2792,6 @@
 }
 
 Thing {
-  ID = "MISC77";
-  DoomEd number = 70;
-  Spawn state = "BBAR1";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 16;
-  Height = 30;
-  Mass = 100;
-  Flags = "mf_solid mf_local";
-  Flags2 = "mf2_telestomp";
-}
-
-Thing {
   ID = "MISC78";
   DoomEd number = 73;
   Spawn state = "HANGNOGUTS";
@@ -3296,8 +3010,6 @@
   Flags2 = "mf2_noteleport";
 }
 
-# HERE STARTS THE NEW SHIT!
-
 Thing {
   ID = "BRUISERSHOTRED";
   DoomEd number = -1;
@@ -3529,54 +3241,6 @@
 }
 
 Thing {
-  ID = "LPOWERUP4";
-  DoomEd number = 4003;
-  Spawn state = "POW40";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_special";
-}
-
-Thing {
-  ID = "LPOWERUP5";
-  DoomEd number = 4004;
-  Spawn state = "POW50";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_special";
-}
-
-Thing {
   ID = "LASERSHOTWEAK";
   DoomEd number = -1;
   Spawn state = "LAZRW1";
@@ -3710,33 +3374,6 @@
 }
 
 Thing {
-  ID = "RDART";
-  DoomEd number = -1;
-  Spawn state = "RDART1";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "DARTHIT1";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "SKESWG";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "ssdth";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Speed = 50;
-  Radius = 10;
-  Height = 8;
-  Mass = 1000;
-  Damage = 1;
-  Flags = "mf_noblockmap mf_missile";
-  Flags2 = "mf2_passmobj mf2_cannotpush";
-}
-
-Thing {
   ID = "EMARINEP";
   DoomEd number = 235;
   Spawn state = "EMARP_STND";
@@ -5160,210 +4797,6 @@
 }
 
 Thing {
-  ID = "CHAINGUNGUY";
-  Name = "Chaingun Guy";
-  DoomEd number = 550;
-  Spawn state = "POSC_STND";
-  See state = "POSC_RUN1";
-  Pain state = "POSC_PAIN";
-  Melee state = "NULL";
-  Missile state = "POSC_ATK1";
-  Death state = "POSC_DIE1";
-  Xdeath state = "POSC_XDIE1";
-  Raise state = "NULL";
-  See sound = "posit1";
-  Attack sound = "pistol";
-  Pain sound = "popain";
-  Death sound = "podth1";
-  Active sound = "posact";
-  Reaction time = 8;
-  Pain chance = 200;
-  Spawn health = 50;
-  Speed = 14;
-  Radius = 31;
-  Height = 72;
-  Mass = 100;
-  Flags = "mf_solid mf_shootable mf_countkill";
-}
-
-Thing {
-  ID = "STALKER";
-  Name = "Stalker";
-  DoomEd number = 901;
-  Spawn state = "STALK_STND";
-  See state = "STALK_RUN1";
-  Pain state = "STALK_PAIN";
-  Melee state = "NULL";
-  Missile state = "STALK_ATK1";
-  Death state = "STALK_DIE1";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "stlkst";
-  Attack sound = "sklatk";
-  Pain sound = "stlkpn";
-  Death sound = "firxpl";
-  Active sound = "dmact";
-  Reaction time = 8;
-  Pain chance = 256;
-  Spawn health = 200;
-  Speed = 8;
-  Radius = 16;
-  Height = 56;
-  Mass = 50;
-  Damage = 3;
-  Flags = "mf_solid mf_shootable mf_float mf_nogravity mf_countkill";
-}
-
-Thing {
-  ID = "NIGHTCRAWLER";
-  Name = "Night Crawler";
-  DoomEd number = 551;
-  Spawn state = "BSGI_STND";
-  See state = "BSGI_SIGHT";
-  Pain state = "BSGI_PAIN";
-  Melee state = "NULL";
-  Missile state = "BSGI_ATK1";
-  Death state = "BSGI_DIE1";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "spisit";
-  Attack sound = "None";
-  Pain sound = "dmpain";
-  Death sound = "spidth";
-  Active sound = "bspact";
-  Reaction time = 8;
-  Pain chance = 128;
-  Spawn health = 750;
-  Speed = 10;
-  Radius = 64;
-  Height = 64;
-  Mass = 600;
-  Flags = "mf_solid mf_shootable mf_countkill";
-}
-
-Thing {
-  ID = "GRENADE";
-  DoomEd number = -1;
-  Spawn state = "GRENADE";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "EXPLODE0";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "rlaunc";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "barexp";
-  Active sound = "None";
-  Reaction time = 256;
-  Spawn health = 1000;
-  Speed = 6;
-  Radius = 11;
-  Height = 8;
-  Mass =80;
-  Damage = 0;
-  Flags = "mf_missile mf_noblockmap mf_dropoff";
-}
-
-Thing {
-  ID = "MT_TELEPORTCHAINGUY";
-  DoomEd number = 7631;
-  Spawn state = "NULL";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_noblockmap mf_nosector mf_local";
-}
-
-Thing {
-  ID = "MT_TELEPORTCRAWLER";
-  DoomEd number = 7632;
-  Spawn state = "NULL";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_noblockmap mf_nosector mf_local";
-}
-
-Thing {
-  ID = "SUPERBONUS";
-  DoomEd number = 553;
-  Spawn state = "BON3";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_special mf_countitem";
-}
-
-Thing {
-  ID = "MISC12";
-  DoomEd number = 2013;
-  Spawn state = "SOUL";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_special mf_countitem";
-}
-
-Thing {
   ID = "LIGHTSOURCE";
   DoomEd number = 5000;
   Spawn state = "SMALL_WHITE_LIGHT";
@@ -8096,428 +7529,6 @@
 }
 
 State {
-  ID = "POSC_STND";
-  Sprite = "POSC";
-  Frame = 0;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "POSC_STND2";
-}
-
-State {
-  ID = "POSC_STND2";
-  Sprite = "POSC";
-  Frame = 1;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "POSC_STND";
-}
-
-State {
-  ID = "POSC_RUN1";
-  Sprite = "POSC";
-  Frame = 0;
-  Tics = 4;
-  Action = "A_Chase";
-  Next state = "POSC_RUN2";
-}
-
-State {
-  ID = "POSC_RUN2";
-  Sprite = "POSC";
-  Frame = 0;
-  Tics = 4;
-  Action = "A_Chase";
-  Next state = "POSC_RUN3";
-}
-
-State {
-  ID = "POSC_RUN3";
-  Sprite = "POSC";
-  Frame = 1;
-  Tics = 4;
-  Action = "A_Chase";
-  Next state = "POSC_RUN4";
-}
-
-State {
-  ID = "POSC_RUN4";
-  Sprite = "POSC";
-  Frame = 1;
-  Tics = 4;
-  Action = "A_Chase";
-  Next state = "POSC_RUN5";
-}
-
-State {
-  ID = "POSC_RUN5";
-  Sprite = "POSC";
-  Frame = 2;
-  Tics = 4;
-  Action = "A_Chase";
-  Next state = "POSC_RUN6";
-}
-
-State {
-  ID = "POSC_RUN6";
-  Sprite = "POSC";
-  Frame = 2;
-  Tics = 4;
-  Action = "A_Chase";
-  Next state = "POSC_RUN7";
-}
-
-State {
-  ID = "POSC_RUN7";
-  Sprite = "POSC";
-  Frame = 3;
-  Tics = 4;
-  Action = "A_Chase";
-  Next state = "POSC_RUN8";
-}
-
-State {
-  ID = "POSC_RUN8";
-  Sprite = "POSC";
-  Frame = 3;
-  Tics = 4;
-  Action = "A_Chase";
-  Next state = "POSC_RUN1";
-}
-
-State {
-  ID = "POSC_ATK1";
-  Sprite = "POSC";
-  Frame = 4;
-  Tics = 2;
-  Action = "A_FaceTarget";
-  Next state = "POSC_ATK2";
-}
-
-State {
-  ID = "POSC_ATK2";
-  Sprite = "POSC";
-  Frame = 5;
-  Flags = fullbright;
-  Tics = 1;
-  Action = "A_CPosAttack";
-  Next state = "POSC_ATK3";
-}
-
-State {
-  ID = "POSC_ATK3";
-  Sprite = "POSC";
-  Frame = 4;
-  Tics = 1;
-  Action = "A_CPosRefire";
-  Next state = "POSC_ATK1";
-}
-
-State {
-  ID = "POSC_PAIN";
-  Sprite = "POSC";
-  Frame = 6;
-  Tics = 3;
-  Next state = "POSC_PAIN2";
-}
-
-State {
-  ID = "POSC_PAIN2";
-  Sprite = "POSC";
-  Frame = 6;
-  Tics = 3;
-  Action = "A_Pain";
-  Next state = "POSC_RUN1";
-}
-
-State {
-  ID = "POSC_DIE1";
-  Sprite = "POSC";
-  Frame = 7;
-  Tics = 5;
-  Next state = "POSC_DIE2";
-}
-
-State {
-  ID = "POSC_DIE2";
-  Sprite = "POSC";
-  Frame = 8;
-  Tics = 5;
-  Action = "A_Scream";
-  Next state = "POSC_DIE3";
-}
-
-State {
-  ID = "POSC_DIE3";
-  Sprite = "POSC";
-  Frame = 9;
-  Tics = 5;
-  Action = "A_Fall";
-  Next state = "POSC_DIE4";
-}
-
-State {
-  ID = "POSC_DIE4";
-  Sprite = "POSC";
-  Frame = 10;
-  Tics = 5;
-  Next state = "POSC_DIE5";
-}
-
-State {
-  ID = "POSC_DIE5";
-  Sprite = "POSC";
-  Frame = 11;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
-  ID = "POSC_XDIE1";
-  Sprite = "POSC";
-  Frame = 12;
-  Tics = 5;
-  Next state = "POSC_XDIE2";
-}
-
-State {
-  ID = "POSC_XDIE2";
-  Sprite = "POSC";
-  Frame = 13;
-  Tics = 5;
-  Action = "A_XScream";
-  Next state = "POSC_XDIE3";
-}
-
-State {
-  ID = "POSC_XDIE3";
-  Sprite = "POSC";
-  Frame = 14;
-  Tics = 5;
-  Action = "A_Fall";
-  Next state = "POSC_XDIE4";
-}
-
-State {
-  ID = "POSC_XDIE4";
-  Sprite = "POSC";
-  Frame = 15;
-  Tics = 5;
-  Next state = "POSC_XDIE5";
-}
-
-State {
-  ID = "POSC_XDIE5";
-  Sprite = "POSC";
-  Frame = 16;
-  Tics = 5;
-  Next state = "POSC_XDIE6";
-}
-
-State {
-  ID = "POSC_XDIE6";
-  Sprite = "POSC";
-  Frame = 17;
-  Tics = 5;
-  Next state = "POSC_XDIE7";
-}
-
-State {
-  ID = "POSC_XDIE7";
-  Sprite = "POSC";
-  Frame = 18;
-  Tics = 5;
-  Next state = "POSC_XDIE8";
-}
-
-State {
-  ID = "POSC_XDIE8";
-  Sprite = "POSC";
-  Frame = 19;
-  Tics = 5;
-  Next state = "POSC_XDIE9";
-}
-
-State {
-  ID = "POSC_XDIE9";
-  Sprite = "POSC";
-  Frame = 20;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
-  ID = "STALK_STND";
-  Sprite = "STLK";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 1;
-  Action = "A_Look";
-  Next state = "STALK_STND";
-}
-
-State {
-  ID = "STALK_RUN1";
-  Sprite = "STLK";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 1;
-  Action = "A_Chase";
-  Next state = "STALK_RUN1";
-}
-
-State {
-  ID = "STALK_ATK1";
-  Sprite = "STLK";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 15;
-  Action = "A_FaceTarget";
-  Next state = "STALK_ATK2";
-}
-
-State {
-  ID = "STALK_ATK2";
-  Sprite = "STLK";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 5;
-  Action = "A_SkelMissile";
-  Next state = "STALK_ATK3";
-}
-
-State {
-  ID = "STALK_ATK3";
-  Sprite = "STLK";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 15;
-  Action = "A_FaceTarget";
-  Next state = "STALK_RUN1";
-}
-
-
-State {
-  ID = "STALK_PAIN";
-  Sprite = "STLK";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 3;
-   Action = "A_Pain";
-  Next state = "STALK_RUN1";
-}
-
-State {
-  ID = "STALK_DIE1";
-  Sprite = "STLK";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "STALK_DIE2";
-}
-
-State {
-  ID = "STALK_DIE2";
-  Sprite = "STLK";
-  Frame = 4;
-  Flags = fullbright;
-  Tics = 6;
-  Action = "A_Scream";
-  Next state = "STALK_DIE3";
-}
-
-State {
-  ID = "STALK_DIE3";
-  Sprite = "STLK";
-  Frame = 5;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "STALK_DIE4";
-}
-
-State {
-  ID = "STALK_DIE4";
-  Sprite = "STLK";
-  Frame = 6;
-  Flags = fullbright;
-  Tics = 6;
-  Action = "A_Fall";
-  Next state = "STALK_DIE5";
-}
-
-State {
-  ID = "STALK_DIE5";
-  Sprite = "STLK";
-  Frame = 7;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "STALK_DIE6";
-}
-
-State {
-  ID = "STALK_DIE6";
-  Sprite = "STLK";
-  Frame = 8;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "STALK_DIE7";
-}
-
-State {
-  ID = "STALK_DIE7";
-  Sprite = "STLK";
-  Frame = 9;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "STALK_DIE8";
-}
-
-State {
-  ID = "STALK_DIE8";
-  Sprite = "STLK";
-  Frame = 10;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "STALK_DIE9";
-}
-
-State {
-  ID = "STALK_DIE9";
-  Sprite = "STLK";
-  Frame = 11;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "STALK_DIE10";
-}
-
-State {
-  ID = "STALK_DIE10";
-  Sprite = "STLK";
-  Frame = 12;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "NULL";
-}
-
-State {
-  ID = "STALK_HIDE";
-  Sprite = "STLK";
-  Frame = 13;
-  Tics = 64;
-  Next state = "STALK_SHOW";
-}
-
-State {
-  ID = "STALK_SHOW";
-  Sprite = "STLK";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 1;
-  Action = "A_SkelMissile";
-  Next state = "STALK_RUN1";
-}
-
-State {
   ID = "SMOKE1";
   Sprite = "PUFF";
   Frame = 1;
@@ -9304,315 +8315,6 @@
 }
 
 State {
-  ID = "CPOS_STND";
-  Sprite = "CPOS";
-  Frame = 0;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "CPOS_STND2";
-}
-
-State {
-  ID = "CPOS_STND2";
-  Sprite = "CPOS";
-  Frame = 1;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "CPOS_STND";
-}
-
-State {
-  ID = "CPOS_RUN1";
-  Sprite = "CPOS";
-  Frame = 0;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "CPOS_RUN2";
-}
-
-State {
-  ID = "CPOS_RUN2";
-  Sprite = "CPOS";
-  Frame = 0;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "CPOS_RUN3";
-}
-
-State {
-  ID = "CPOS_RUN3";
-  Sprite = "CPOS";
-  Frame = 1;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "CPOS_RUN4";
-}
-
-State {
-  ID = "CPOS_RUN4";
-  Sprite = "CPOS";
-  Frame = 1;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "CPOS_RUN5";
-}
-
-State {
-  ID = "CPOS_RUN5";
-  Sprite = "CPOS";
-  Frame = 2;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "CPOS_RUN6";
-}
-
-State {
-  ID = "CPOS_RUN6";
-  Sprite = "CPOS";
-  Frame = 2;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "CPOS_RUN7";
-}
-
-State {
-  ID = "CPOS_RUN7";
-  Sprite = "CPOS";
-  Frame = 3;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "CPOS_RUN8";
-}
-
-State {
-  ID = "CPOS_RUN8";
-  Sprite = "CPOS";
-  Frame = 3;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "CPOS_RUN1";
-}
-
-State {
-  ID = "CPOS_ATK1";
-  Sprite = "CPOS";
-  Frame = 4;
-  Tics = 10;
-  Action = "A_FaceTarget";
-  Next state = "CPOS_ATK2";
-}
-
-State {
-  ID = "CPOS_ATK2";
-  Sprite = "CPOS";
-  Frame = 5;
-  Flags = fullbright;
-  Tics = 4;
-  Action = "A_CPosAttack";
-  Next state = "CPOS_ATK3";
-}
-
-State {
-  ID = "CPOS_ATK3";
-  Sprite = "CPOS";
-  Frame = 4;
-  Flags = fullbright;
-  Tics = 4;
-  Action = "A_CPosAttack";
-  Next state = "CPOS_ATK4";
-}
-
-State {
-  ID = "CPOS_ATK4";
-  Sprite = "CPOS";
-  Frame = 5;
-  Tics = 1;
-  Action = "A_CPosRefire";
-  Next state = "CPOS_ATK2";
-}
-
-State {
-  ID = "CPOS_PAIN";
-  Sprite = "CPOS";
-  Frame = 6;
-  Tics = 3;
-  Next state = "CPOS_PAIN2";
-}
-
-State {
-  ID = "CPOS_PAIN2";
-  Sprite = "CPOS";
-  Frame = 6;
-  Tics = 3;
-  Action = "A_Pain";
-  Next state = "CPOS_RUN1";
-}
-
-State {
-  ID = "CPOS_DIE1";
-  Sprite = "CPOS";
-  Frame = 7;
-  Tics = 5;
-  Next state = "CPOS_DIE2";
-}
-
-State {
-  ID = "CPOS_DIE2";
-  Sprite = "CPOS";
-  Frame = 8;
-  Tics = 5;
-  Action = "A_Scream";
-  Next state = "CPOS_DIE3";
-}
-
-State {
-  ID = "CPOS_DIE3";
-  Sprite = "CPOS";
-  Frame = 9;
-  Tics = 5;
-  Action = "A_Fall";
-  Next state = "CPOS_DIE4";
-}
-
-State {
-  ID = "CPOS_DIE4";
-  Sprite = "CPOS";
-  Frame = 10;
-  Tics = 5;
-  Next state = "CPOS_DIE5";
-}
-
-State {
-  ID = "CPOS_DIE5";
-  Sprite = "CPOS";
-  Frame = 11;
-  Tics = 5;
-  Next state = "CPOS_DIE6";
-}
-
-State {
-  ID = "CPOS_DIE6";
-  Sprite = "CPOS";
-  Frame = 12;
-  Tics = 5;
-  Next state = "CPOS_DIE7";
-}
-
-State {
-  ID = "CPOS_DIE7";
-  Sprite = "CPOS";
-  Frame = 13;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
-  ID = "CPOS_XDIE1";
-  Sprite = "CPOS";
-  Frame = 14;
-  Tics = 5;
-  Next state = "CPOS_XDIE2";
-}
-
-State {
-  ID = "CPOS_XDIE2";
-  Sprite = "CPOS";
-  Frame = 15;
-  Tics = 5;
-  Action = "A_XScream";
-  Next state = "CPOS_XDIE3";
-}
-
-State {
-  ID = "CPOS_XDIE3";
-  Sprite = "CPOS";
-  Frame = 16;
-  Tics = 5;
-  Action = "A_Fall";
-  Next state = "CPOS_XDIE4";
-}
-
-State {
-  ID = "CPOS_XDIE4";
-  Sprite = "CPOS";
-  Frame = 17;
-  Tics = 5;
-  Next state = "CPOS_XDIE5";
-}
-
-State {
-  ID = "CPOS_XDIE5";
-  Sprite = "CPOS";
-  Frame = 18;
-  Tics = 5;
-  Next state = "CPOS_XDIE6";
-}
-
-State {
-  ID = "CPOS_XDIE6";
-  Sprite = "CPOS";
-  Frame = 19;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
-  ID = "CPOS_RAISE1";
-  Sprite = "CPOS";
-  Frame = 13;
-  Tics = 5;
-  Next state = "CPOS_RAISE2";
-}
-
-State {
-  ID = "CPOS_RAISE2";
-  Sprite = "CPOS";
-  Frame = 12;
-  Tics = 5;
-  Next state = "CPOS_RAISE3";
-}
-
-State {
-  ID = "CPOS_RAISE3";
-  Sprite = "CPOS";
-  Frame = 11;
-  Tics = 5;
-  Next state = "CPOS_RAISE4";
-}
-
-State {
-  ID = "CPOS_RAISE4";
-  Sprite = "CPOS";
-  Frame = 10;
-  Tics = 5;
-  Next state = "CPOS_RAISE5";
-}
-
-State {
-  ID = "CPOS_RAISE5";
-  Sprite = "CPOS";
-  Frame = 9;
-  Tics = 5;
-  Next state = "CPOS_RAISE6";
-}
-
-State {
-  ID = "CPOS_RAISE6";
-  Sprite = "CPOS";
-  Frame = 8;
-  Tics = 5;
-  Next state = "CPOS_RAISE7";
-}
-
-State {
-  ID = "CPOS_RAISE7";
-  Sprite = "CPOS";
-  Frame = 7;
-  Tics = 5;
-  Next state = "CPOS_RUN1";
-}
-
-State {
   ID = "TROO_STND";
   Sprite = "TROO";
   Frame = 0;
@@ -11776,238 +10478,6 @@
 }
 
 State {
-  ID = "BSGI_STND";
-  Sprite = "BSGI";
-  Frame = 0;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "BSGI_STND2";
-}
-
-State {
-  ID = "BSGI_STND2";
-  Sprite = "BSGI";
-  Frame = 1;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "BSGI_STND";
-}
-
-State {
-  ID = "BSGI_RUN1";
-  Sprite = "BSGI";
-  Frame = 0;
-  Tics = 3;
-  Action = "A_BabyMetal";
-  Next state = "BSGI_RUN2";
-}
-
-State {
-  ID = "BSGI_RUN2";
-  Sprite = "BSGI";
-  Frame = 0;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN3";
-}
-
-State {
-  ID = "BSGI_RUN3";
-  Sprite = "BSGI";
-  Frame = 1;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN4";
-}
-
-State {
-  ID = "BSGI_RUN4";
-  Sprite = "BSGI";
-  Frame = 1;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN5";
-}
-
-State {
-  ID = "BSGI_RUN5";
-  Sprite = "BSGI";
-  Frame = 2;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN6";
-}
-
-State {
-  ID = "BSGI_RUN6";
-  Sprite = "BSGI";
-  Frame = 2;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN7";
-}
-
-State {
-  ID = "BSGI_RUN7";
-  Sprite = "BSGI";
-  Frame = 3;
-  Tics = 3;
-  Action = "A_Metal";
-  Next state = "BSGI_RUN8";
-}
-
-State {
-  ID = "BSGI_RUN8";
-  Sprite = "BSGI";
-  Frame = 3;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN1";
-}
-
-State {
-  ID = "BSGI_RUN9";
-  Sprite = "BSGI";
-  Frame = 4;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN10";
-}
-
-State {
-  ID = "BSGI_RUN10";
-  Sprite = "BSGI";
-  Frame = 4;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN11";
-}
-
-State {
-  ID = "BSGI_RUN11";
-  Sprite = "BSGI";
-  Frame = 5;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN12";
-}
-
-State {
-  ID = "BSGI_RUN12";
-  Sprite = "BSGI";
-  Frame = 5;
-  Tics = 3;
-  Action = "A_Chase";
-  Next state = "BSGI_RUN1";
-}
-
-State {
-  ID = "BSGI_ATK1";
-  Sprite = "BSGI";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 20;
-  Action = "A_FaceTarget";
-  Next state = "BSGI_ATK2";
-}
-
-State {
-  ID = "BSGI_ATK2";
-  Sprite = "BSGI";
-  Frame = 4;
-  Flags = fullbright;
-  Tics = 4;
-  Action = "A_BspiAttack";
-  Next state = "BSGI_ATK3";
-}
-
-State {
-  ID = "BSGI_ATK3";
-  Sprite = "BSGI";
-  Frame = 4;
-  Flags = fullbright;
-  Tics = 5;
-  Action = "A_FaceTarget";
-  Next state = "BSGI_SIGHT";
-}
-
-State {
-  ID = "BSGI_PAIN";
-  Sprite = "BSGI";
-  Frame = 5;
-  Tics = 3;
-  Action = "A_FaceTarget";
-  Next state = "BSGI_PAIN2";
-}
-
-State {
-  ID = "BSGI_PAIN2";
-  Sprite = "BSGI";
-  Frame = 5;
-  Tics = 3;
-  Action = "A_Pain";
-  Next state = "BSGI_RUN1";
-}
-
-State {
-  ID = "BSGI_DIE1";
-  Sprite = "BSGI";
-  Frame = 6;
-  Tics = 20;
-  Action = "A_Scream";
-  Next state = "BSGI_DIE2";
-}
-
-State {
-  ID = "BSGI_DIE2";
-  Sprite = "BSGI";
-  Frame = 7;
-  Tics = 7;
-  Action = "A_Fall";
-  Next state = "BSGI_DIE3";
-}
-
-State {
-  ID = "BSGI_DIE3";
-  Sprite = "BSGI";
-  Frame = 8;
-  Tics = 7;
-  Next state = "BSGI_DIE4";
-}
-
-State {
-  ID = "BSGI_DIE4";
-  Sprite = "BSGI";
-  Frame = 9;
-  Tics = 7;
-  Next state = "BSGI_DIE5";
-}
-
-State {
-  ID = "BSGI_DIE5";
-  Sprite = "BSGI";
-  Frame = 10;
-  Tics = 7;
-  Next state = "BSGI_DIE6";
-}
-
-State {
-  ID = "BSGI_DIE6";
-  Sprite = "BSGI";
-  Frame = 11;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
-  ID = "BSGI_DIE7";
-  Sprite = "BSGI";
-  Frame = 11;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
   ID = "ARACH_PLAZ";
   Sprite = "APLS";
   Frame = 0;
@@ -13532,85 +12002,6 @@
 }
 
 State {
-  ID = "EVILEYE";
-  Sprite = "CEYE";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 3;
-  Next state = "EVILEYE2";
-}
-
-State {
-  ID = "EVILEYE2";
-  Sprite = "CEYE";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 3;
-  Next state = "EVILEYE3";
-}
-
-State {
-  ID = "EVILEYE3";
-  Sprite = "CEYE";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 3;
-  Next state = "EVILEYE4";
-}
-
-State {
-  ID = "EVILEYE4";
-  Sprite = "CEYE";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 3;
-  Next state = "EVILEYE";
-}
-
-State {
-  ID = "FLOATSKULL";
-  Sprite = "FSKU";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "FLOATSKULL2";
-}
-
-State {
-  ID = "FLOATSKULL2";
-  Sprite = "FSKU";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "FLOATSKULL3";
-}
-
-State {
-  ID = "FLOATSKULL3";
-  Sprite = "FSKU";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "FLOATSKULL";
-}
-
-State {
-  ID = "HEARTCOL";
-  Sprite = "COL5";
-  Frame = 0;
-  Tics = 14;
-  Next state = "HEARTCOL2";
-}
-
-State {
-  ID = "HEARTCOL2";
-  Sprite = "COL5";
-  Frame = 1;
-  Tics = 14;
-  Next state = "HEARTCOL";
-}
-
-State {
   ID = "BLUETORCH";
   Sprite = "TBLU";
   Frame = 0;
@@ -14440,150 +12831,6 @@
 }
 
 State {
-  ID = "POW40";
-  Sprite = "POW4";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW41";
-}
-
-State {
-  ID = "POW41";
-  Sprite = "POW4";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW42";
-}
-
-State {
-  ID = "POW42";
-  Sprite = "POW4";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW43";
-}
-
-State {
-  ID = "POW43";
-  Sprite = "POW4";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW44";
-}
-
-State {
-  ID = "POW44";
-  Sprite = "POW4";
-  Frame = 4;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW45";
-}
-
-State {
-  ID = "POW45";
-  Sprite = "POW4";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW46";
-}
-
-State {
-  ID = "POW46";
-  Sprite = "POW4";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW47";
-}
-
-State {
-  ID = "POW47";
-  Sprite = "POW4";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW40";
-}
-
-State {
-  ID = "POW50";
-  Sprite = "POW5";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW51";
-}
-
-State {
-  ID = "POW51";
-  Sprite = "POW5";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW52";
-}
-
-State {
-  ID = "POW52";
-  Sprite = "POW5";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW53";
-}
-
-State {
-  ID = "POW53";
-  Sprite = "POW5";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW54";
-}
-
-State {
-  ID = "POW54";
-  Sprite = "POW5";
-  Frame = 4;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW55";
-}
-
-State {
-  ID = "POW55";
-  Sprite = "POW5";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW56";
-}
-
-State {
-  ID = "POW56";
-  Sprite = "POW5";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW57";
-}
-
-State {
-  ID = "POW57";
-  Sprite = "POW5";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "POW50";
-}
-
-State {
   ID = "LAZRW1";
   Sprite = "LAZR";
   Frame = 0;
@@ -15400,14 +13647,6 @@
 }
 
 State {
-  ID = "RDART1";
-  Sprite = "DART";
-  Frame = 8;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
   ID = "DARTHIT1";
   Sprite = "DART";
   Frame = 1;
@@ -16498,170 +14737,3 @@
   Tics = 3;
   Next state = "NULL";
 }
-
-State {
-  ID = "GRENADE";
-  Sprite = "GREN";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 2;
-  Action = "A_Rocketpuff";
-  Next state = "GRENADE2";
-}
-
-State {
-  ID = "GRENADE2";
-  Sprite = "GREN";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 2;
-  Action = "A_Rocketpuff";
-  Next state = "GRENADE3";
-}
-
-State {
-  ID = "GRENADE3";
-  Sprite = "GREN";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 2;
-  Action = "A_Rocketpuff";
-  Next state = "GRENADE4";
-}
-
-State {
-  ID = "GRENADE4";
-  Sprite = "GREN";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 2;
-  Action = "A_Rocketpuff";
-  Next state = "GRENADE2";
-}
-
-State {
-  ID = "BON3";
-  Sprite = "BON3";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "BON3A";
-}
-
-State {
-  ID = "BON3A";
-  Sprite = "BON3";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "BON3B";
-}
-
-State {
-  ID = "BON3B";
-  Sprite = "BON3";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "BON3C";
-}
-
-State {
-  ID = "BON3C";
-  Sprite = "BON3";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "BON3D";
-}
-
-State {
-  ID = "BON3D";
-  Sprite = "BON3";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "BON3E";
-}
-
-State {
-  ID = "BON3E";
-  Sprite = "BON3";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 6;
-  Next state = "BON3";
-}
-
-State {
-  ID = "HFOG";
-  Sprite = "HFOG";
-  Frame = 7;
-  Flags = fullbright;
-  Tics = 2;
-  Action = "A_Pain";
-  Next state = "HFOG01";
-}
-
-State {
-  ID = "HFOG01";
-  Sprite = "HFOG";
-  Frame = 6;
-  Flags = fullbright;
-  Tics = 2;
-  Next state = "HFOG02";
-}
-
-State {
-  ID = "HFOG02";
-  Sprite = "HFOG";
-  Frame = 5;
-  Flags = fullbright;
-  Tics = 2;
-  Next state = "HFOG03";
-}
-
-State {
-  ID = "HFOG03";
-  Sprite = "HFOG";
-  Frame = 4;
-  Flags = fullbright;
-  Tics = 2;
-  Next state = "HFOG04";
-}
-
-State {
-  ID = "HFOG04";
-  Sprite = "HFOG";
-  Frame = 3;
-  Flags = fullbright;
-  Tics = 2;
-  Next state = "HFOG05";
-}
-
-State {
-  ID = "HFOG05";
-  Sprite = "HFOG";
-  Frame = 2;
-  Flags = fullbright;
-  Tics = 2;
-  Next state = "HFOG07";
-}
-
-State {
-  ID = "HFOG07";
-  Sprite = "HFOG";
-  Frame = 1;
-  Flags = fullbright;
-  Tics = 2;
-  Next state = "HFOG08";
-}
-
-State {
-  ID = "HFOG08";
-  Sprite = "HFOG";
-  Frame = 0;
-  Flags = fullbright;
-  Tics = 2;
-  Next state = "NULL";
-}

Modified: trunk/doomsday/plugins/jdoom64/defs/particles.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/particles.ded	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/defs/particles.ded	2008-06-14 02:15:34 UTC (rev 5709)
@@ -566,7 +566,6 @@
 Copy Generator { State = "PLAY_XDIE2"; }
 Copy Generator { State = "SPOS_XDIE2"; }
 Copy Generator { State = "TROO_XDIE2"; }
-Copy Generator { State = "CPOS_XDIE2"; }
 Copy Generator { State = "SSWV_XDIE2"; }
 
 # Pink demon death blood.

Modified: trunk/doomsday/plugins/jdoom64/defs/sprites.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/sprites.ded	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/defs/sprites.ded	2008-06-14 02:15:34 UTC (rev 5709)
@@ -93,13 +93,10 @@
 Sprite { ID = "FATB"; }
 Sprite { ID = "FBXP"; }
 Sprite { ID = "SKEL"; }
-Sprite { ID = "CPOS"; }
 Sprite { ID = "BAL7"; }
 Sprite { ID = "BOS2"; }
 Sprite { ID = "APBX"; }
 Sprite { ID = "BEXP"; }
-Sprite { ID = "FCAN"; }
-Sprite { ID = "BON3"; }
 Sprite { ID = "BON4"; }
 Sprite { ID = "LGUN"; }
 Sprite { ID = "POW1"; }
@@ -126,9 +123,6 @@
 Sprite { ID = "CBRA"; }
 Sprite { ID = "COL6"; }
 Sprite { ID = "ELEC"; }
-Sprite { ID = "CEYE"; }
-Sprite { ID = "FSKU"; }
-Sprite { ID = "COL5"; }
 Sprite { ID = "TBLU"; }
 Sprite { ID = "TGRN"; }
 Sprite { ID = "TRED"; }
@@ -159,8 +153,3 @@
 Sprite { ID = "MBAL"; }
 Sprite { ID = "MPUF"; }
 Sprite { ID = "BLNK"; }
-Sprite { ID = "POSC"; }
-Sprite { ID = "BSGI"; }
-Sprite { ID = "GREN"; }
-Sprite { ID = "STLK"; }
-Sprite { ID = "HFOG"; }

Modified: trunk/doomsday/plugins/jdoom64/defs/text.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/text.ded	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/defs/text.ded	2008-06-14 02:15:34 UTC (rev 5709)
@@ -139,11 +139,6 @@
 }
 
 Text {
-  ID = "GOTHELLBONUS";
-  Text = "Picked up a hell potion.";
-}
-
-Text {
   ID = "GOTSTIM";
   Text = "Picked up a stimpack.";
 }

Modified: trunk/doomsday/plugins/jdoom64/include/acfnlink.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/acfnlink.h	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/include/acfnlink.h	2008-06-14 02:15:34 UTC (rev 5709)
@@ -53,8 +53,6 @@
 void C_DECL A_Chase();
 void C_DECL A_CheckReload();
 void C_DECL A_CloseShotgun2();
-void C_DECL A_CPosAttack();
-void C_DECL A_CPosRefire();
 void C_DECL A_CyberAttack();
 void C_DECL A_Explode();
 void C_DECL A_FaceTarget();
@@ -105,8 +103,6 @@
 
 //jd64
 void C_DECL A_BruisredAttack();
-void C_DECL A_CposPanLeft();
-void C_DECL A_CposPanRight();
 void C_DECL A_DrawPlasmaTube();
 void C_DECL A_PlasmaBuzz();
 void C_DECL A_Lasersmoke();

Modified: trunk/doomsday/plugins/jdoom64/include/d_englsh.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/d_englsh.h	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/include/d_englsh.h	2008-06-14 02:15:34 UTC (rev 5709)
@@ -69,7 +69,6 @@
 #define GOTMEGA             GET_TXT(TXT_GOTMEGA)
 #define GOTHTHBONUS         GET_TXT(TXT_GOTHTHBONUS)
 #define GOTARMBONUS         GET_TXT(TXT_GOTARMBONUS)
-#define GOTHELLBONUS        GET_TXT(TXT_GOTHELLBONUS) // jd64
 #define GOTSTIM             GET_TXT(TXT_GOTSTIM)
 #define GOTMEDINEED         GET_TXT(TXT_GOTMEDINEED)
 #define GOTMEDIKIT          GET_TXT(TXT_GOTMEDIKIT)

Modified: trunk/doomsday/plugins/jdoom64/include/info.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/info.h	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/include/info.h	2008-06-14 02:15:34 UTC (rev 5709)
@@ -183,13 +183,10 @@
     SPR_FATB,
     SPR_FBXP,
     SPR_SKEL,
-    SPR_CPOS,
     SPR_BAL7,
     SPR_BOS2,
     SPR_APBX,
     SPR_BEXP,
-    SPR_FCAN,
-    SPR_BON3,
     SPR_BON4,
     SPR_LGUN,
     SPR_POW1,
@@ -216,9 +213,6 @@
     SPR_CBRA,
     SPR_COL6,
     SPR_ELEC,
-    SPR_CEYE,
-    SPR_FSKU,
-    SPR_COL5,
     SPR_TBLU,
     SPR_TGRN,
     SPR_TRED,
@@ -249,11 +243,6 @@
     SPR_MBAL,
     SPR_MPUF,
     SPR_BLNK,
-    SPR_POSC,
-    SPR_BSGI,
-    SPR_GREN,
-    SPR_STLK,
-    SPR_HFOG,
     NUMSPRITES
 } spritetype_e;
 
@@ -508,53 +497,6 @@
     S_SPOS_RAISE3,
     S_SPOS_RAISE4,
     S_SPOS_RAISE5,
-    S_POSC_STND,
-    S_POSC_STND2,
-    S_POSC_RUN1,
-    S_POSC_RUN2,
-    S_POSC_RUN3,
-    S_POSC_RUN4,
-    S_POSC_RUN5,
-    S_POSC_RUN6,
-    S_POSC_RUN7,
-    S_POSC_RUN8,
-    S_POSC_ATK1,
-    S_POSC_ATK2,
-    S_POSC_ATK3,
-    S_POSC_PAIN,
-    S_POSC_PAIN2,
-    S_POSC_DIE1,
-    S_POSC_DIE2,
-    S_POSC_DIE3,
-    S_POSC_DIE4,
-    S_POSC_DIE5,
-    S_POSC_XDIE1,
-    S_POSC_XDIE2,
-    S_POSC_XDIE3,
-    S_POSC_XDIE4,
-    S_POSC_XDIE5,
-    S_POSC_XDIE6,
-    S_POSC_XDIE7,
-    S_POSC_XDIE8,
-    S_POSC_XDIE9,
-    S_STALK_STND,
-    S_STALK_RUN1,
-    S_STALK_ATK1,
-    S_STALK_ATK2,
-    S_STALK_ATK3,
-    S_STALK_PAIN,
-    S_STALK_DIE1,
-    S_STALK_DIE2,
-    S_STALK_DIE3,
-    S_STALK_DIE4,
-    S_STALK_DIE5,
-    S_STALK_DIE6,
-    S_STALK_DIE7,
-    S_STALK_DIE8,
-    S_STALK_DIE9,
-    S_STALK_DIE10,
-    S_STALK_HIDE,
-    S_STALK_SHOW,
     S_SMOKE1,
     S_SMOKE2,
     S_SMOKE3,
@@ -927,32 +869,6 @@
     S_BSPI_RAISE5,
     S_BSPI_RAISE6,
     S_BSPI_RAISE7,
-    S_BSGI_STND,
-    S_BSGI_STND2,
-    S_BSGI_RUN1,
-    S_BSGI_RUN2,
-    S_BSGI_RUN3,
-    S_BSGI_RUN4,
-    S_BSGI_RUN5,
-    S_BSGI_RUN6,
-    S_BSGI_RUN7,
-    S_BSGI_RUN8,
-    S_BSGI_RUN9,
-    S_BSGI_RUN10,
-    S_BSGI_RUN11,
-    S_BSGI_RUN12,
-    S_BSGI_ATK1,
-    S_BSGI_ATK2,
-    S_BSGI_ATK3,
-    S_BSGI_PAIN,
-    S_BSGI_PAIN2,
-    S_BSGI_DIE1,
-    S_BSGI_DIE2,
-    S_BSGI_DIE3,
-    S_BSGI_DIE4,
-    S_BSGI_DIE5,
-    S_BSGI_DIE6,
-    S_BSGI_DIE7,
     S_ARACH_PLAZ,
     S_ARACH_PLAZ2,
     S_ARACH_PLEX,
@@ -1023,9 +939,6 @@
     S_BEXP3,
     S_BEXP4,
     S_BEXP5,
-    S_BBAR1,
-    S_BBAR2,
-    S_BBAR3,
     S_BON1,
     S_BON1A,
     S_BON1B,
@@ -1127,15 +1040,6 @@
     S_TORCHTREE,
     S_BIGTREE,
     S_TECHPILLAR,
-    S_EVILEYE,
-    S_EVILEYE2,
-    S_EVILEYE3,
-    S_EVILEYE4,
-    S_FLOATSKULL,
-    S_FLOATSKULL2,
-    S_FLOATSKULL3,
-    S_HEARTCOL,
-    S_HEARTCOL2,
     S_BLUETORCH,
     S_BLUETORCH2,
     S_BLUETORCH3,
@@ -1229,22 +1133,6 @@
     S_POW35,
     S_POW36,
     S_POW37,
-    S_POW40,
-    S_POW41,
-    S_POW42,
-    S_POW43,
-    S_POW44,
-    S_POW45,
-    S_POW46,
-    S_POW47,
-    S_POW50,
-    S_POW51,
-    S_POW52,
-    S_POW53,
-    S_POW54,
-    S_POW55,
-    S_POW56,
-    S_POW57,
     S_LAZRW1,
     S_LAZRW2,
     S_MOTH_STND,
@@ -1357,7 +1245,6 @@
     MT_BLOOD,
     MT_TFOG,
     MT_IFOG,
-    MT_HFOG,
     MT_TELEPORTMAN,
     MT_EXTRABFG,
     MT_MISC0,
@@ -1404,8 +1291,6 @@
     MT_MISC34,
     MT_MISC35,
     MT_MISC36,
-    MT_MISC37,
-    MT_MRRAIN,
     MT_MISC39,
     MT_MISC40,
     MT_MISC41,
@@ -1428,13 +1313,6 @@
     MT_MISC58,
     MT_MISC59,
     MT_MISC60,
-    MT_MISC61,
-    MT_MISC62,
-    MT_MISC63,
-    MT_MISC64,
-    MT_MISC65,
-    MT_MISC66,
-    MT_MISC67,
     MT_MISC68,
     MT_MISC69,
     MT_MISC70,
@@ -1444,7 +1322,6 @@
     MT_MISC74,
     MT_MISC75,
     MT_MISC76,
-    MT_MISC77,
     MT_MISC78,
     MT_MISC79,
     MT_MISC80,
@@ -1463,14 +1340,11 @@
     MT_LPOWERUP1,
     MT_LPOWERUP2,
     MT_LPOWERUP3,
-    MT_LPOWERUP4,
-    MT_LPOWERUP5,
     MT_LASERSHOTWEAK,
     MT_BITCH,
     MT_BITCHBALL,
     MT_MOTHERPUFF,
     MT_DART,
-    MT_RDART,
     MT_EMARINEP,
 
     //LIST OF SPAWN THINGS - SAMUEL
@@ -1532,13 +1406,6 @@
     MT_TELEPORTYKEY2,
     MT_NTROOP,
     MT_KABOOM,
-    MT_CHAINGUNGUY,
-    MT_STALKER,
-    MT_NIGHTCRAWLER,
-    MT_GRENADE,
-    MT_TELEPORTCHAINGUY,
-    MT_TELEPORTCRAWLER,
-    MT_SUPERBONUS,
     MT_LIGHTSOURCE,
 
     MT_TEMPSOUNDORIGIN,
@@ -1592,7 +1459,6 @@
     TXT_GOTMEGA,
     TXT_GOTHTHBONUS,
     TXT_GOTARMBONUS,
-    TXT_GOTHELLBONUS,
     TXT_GOTSTIM,
     TXT_GOTMEDINEED,
     TXT_GOTMEDIKIT,

Modified: trunk/doomsday/plugins/jdoom64/include/sndidx.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/sndidx.h	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/include/sndidx.h	2008-06-14 02:15:34 UTC (rev 5709)
@@ -77,7 +77,6 @@
     SFX_CACSIT,                    // 042
     SFX_BRSSIT,                    // 043
     SFX_CYBSIT,                    // 044
-    SFX_SPISIT,                    // 045
     SFX_BSPSIT,                    // 046
     SFX_KNTSIT,                    // 047
     SFX_VILSIT,                    // 048
@@ -101,7 +100,6 @@
     SFX_SKLDTH,                    // 066
     SFX_BRSDTH,                    // 067
     SFX_CYBDTH,                    // 068
-    SFX_SPIDTH,                    // 069
     SFX_BSPDTH,                    // 070
     SFX_VILDTH,                    // 071
     SFX_KNTDTH,                    // 072
@@ -145,9 +143,6 @@
     SFX_MTHPAI,
     SFX_MTHACT,
     SFX_MTHDTH,
-    SFX_STLKST,
-    SFX_STLKPN,
-    SFX_STLKTP,
     SFX_HTIME,
     // < D64TC
     NUMSFX

Modified: trunk/doomsday/plugins/jdoom64/src/acfnlink.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/acfnlink.c	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/src/acfnlink.c	2008-06-14 02:15:34 UTC (rev 5709)
@@ -53,10 +53,6 @@
     {"A_Chase",             A_Chase},
     {"A_CheckReload",       A_CheckReload},
     {"A_CloseShotgun2",     A_CloseShotgun2},
-    {"A_CPosAttack",        A_CPosAttack},
-    {"A_CposPanLeft",       A_CposPanLeft}, //jd64
-    {"A_CposPanRight",      A_CposPanRight}, //jd64
-    {"A_CPosRefire",        A_CPosRefire},
     {"A_CyberAttack",       A_CyberAttack},
     {"A_Explode",           A_Explode},
     {"A_FaceTarget",        A_FaceTarget},

Modified: trunk/doomsday/plugins/jdoom64/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_enemy.c	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/src/p_enemy.c	2008-06-14 02:15:34 UTC (rev 5709)
@@ -1147,66 +1147,6 @@
     }
 }
 
-/**
- * d64tc
- */
-void C_DECL A_CposPanLeft(mobj_t* actor)
-{
-    actor->angle = actor->angle + ANG90/4;
-}
-
-/**
- * d64tc
- */
-void C_DECL A_CposPanRight(mobj_t* actor)
-{
-    actor->angle = actor->angle - ANG90/4;
-}
-
-void C_DECL A_CPosAttack(mobj_t *actor)
-{
-    int                 angle, bangle, damage, r;
-    float               slope;
-
-    if(!actor->target)
-        return;
-
-    S_StartSound(SFX_PISTOL, actor);
-    A_FaceTarget(actor);
-    bangle = actor->angle;
-    slope = P_AimLineAttack(actor, bangle, MISSILERANGE);
-
-    angle = bangle + ((P_Random() - P_Random()) << 20);
-    damage = ((P_Random() % 5) + 1) * 3;
-
-    r = P_Random();
-    if(r < 64)
-        A_CposPanLeft(actor);
-    else if(r < 128)
-        A_CposPanRight(actor);
-
-    P_LineAttack(actor, angle, MISSILERANGE, slope, damage);
-}
-
-void C_DECL A_CPosRefire(mobj_t *actor)
-{
-    if(!actor->target) // jd64
-        return;
-
-    // Keep firing unless target got out of sight.
-    A_FaceTarget(actor);
-
-    if(P_Random() < 30) // jd64: was "if(P_Random() < 40)"
-        return;
-
-    // jd64: Added "|| P_Random() < 40"
-    if(!actor->target || actor->target->health <= 0 ||
-       !P_CheckSight(actor, actor->target) || P_Random() < 40)
-    {
-        P_MobjChangeState(actor, actor->info->seeState);
-    }
-}
-
 void C_DECL A_SpidRefire(mobj_t *actor)
 {
     // Keep firing unless target got out of sight.
@@ -1272,27 +1212,8 @@
  */
 void C_DECL A_BspiAttack(mobj_t *actor)
 {
-    int                 type = P_Random() % 2;
-
-    switch(type)
-    {
-    case 0:
-        if(actor->type == MT_BABY || actor->info->doomedNum == 234)
-            type = MT_ARACHPLAZ;
-        else if(actor->type == MT_NIGHTCRAWLER)
-            type = MT_GRENADE;
-        break;
-
-    case 1:
-        if(actor->type == MT_BABY || actor->info->doomedNum == 234)
-            type = MT_ARACHPLAZ;
-        else if(actor->type == MT_NIGHTCRAWLER)
-            type = MT_GRENADE;
-        break;
-    }
-
-    BabyFire(actor, type, false);
-    BabyFire(actor, type, true);
+    BabyFire(actor, MT_ARACHPLAZ, false);
+    BabyFire(actor, MT_ARACHPLAZ, true);
 }
 
 /**
@@ -1585,65 +1506,19 @@
     P_SpawnMissile(MT_BRUISERSHOTRED, actor, actor->target);
 }
 
-/**
- * kaiser - Too lazy to add a new action, instead I'll just borrow this one.
- * DJS - yup you are lazy :P
- *
- * \todo Implement this properly as two seperate actions.
- */
 void C_DECL A_SkelMissile(mobj_t *actor)
 {
     mobj_t             *mo;
 
-    if(actor->type == MT_STALKER)
-    {
-        if(!((actor->flags & MF_SOLID) && (actor->flags & MF_SHOOTABLE)))
-        {
-            actor->flags |= MF_SOLID;
-            actor->flags |= MF_SHOOTABLE;
+    if(!actor->target)
+        return;
 
-            P_SpawnMobj3fv(MT_HFOG, actor->pos);
-            S_StartSound(SFX_STLKTP, actor);
-            return;
-        }
+    A_FaceTarget(actor);
+    mo = P_SpawnMissile(MT_TRACER, actor, actor->target);
 
-        if(!actor->target)
-            return;
-
-        if(P_Random() < 64)
-        {
-            P_SpawnMobj3fv(MT_HFOG, actor->pos);
-
-            S_StartSound(SFX_STLKTP, actor);
-            P_MobjChangeState(actor, S_STALK_HIDE);
-            actor->flags &= ~MF_SOLID;
-            actor->flags &= ~MF_SHOOTABLE;
-
-            memcpy(actor->pos, actor->target->pos, sizeof(actor->pos));
-            actor->pos[VZ] += 32;
-        }
-        else
-        {
-            A_FaceTarget(actor);
-            mo = P_SpawnMissile(MT_TRACER, actor, actor->target);
-
-            mo->pos[VX] += mo->mom[MX];
-            mo->pos[VY] += mo->mom[MY];
-            mo->tracer = actor->target;
-        }
-    }
-    else
-    {
-        if(!actor->target)
-            return;
-
-        A_FaceTarget(actor);
-        mo = P_SpawnMissile(MT_TRACER, actor, actor->target);
-
-        mo->pos[VX] += mo->mom[MX];
-        mo->pos[VY] += mo->mom[MY];
-        mo->tracer = actor->target;
-    }
+    mo->pos[VX] += mo->mom[MX];
+    mo->pos[VY] += mo->mom[MY];
+    mo->tracer = actor->target;
 }
 
 void C_DECL A_Tracer(mobj_t *actor)
@@ -2050,18 +1925,6 @@
         return;
 
     P_SpawnMobj3fv(MT_ROCKETPUFF, actor->pos);
-
-    if(actor->type == MT_GRENADE)
-    {
-        actor->reactionTime -= 8;
-        if(actor->reactionTime <= 0)
-        {
-            actor->mom[MX] = actor->mom[MY] = actor->mom[MZ] = 0;
-
-            P_MobjChangeState(actor, actor->info->deathState);
-            S_StartSound(actor->info->deathSound, actor);
-        }
-    }
 }
 
 /**
@@ -2094,17 +1957,7 @@
 
 void C_DECL A_Explode(mobj_t *mo)
 {
-    // jd64 >
-    int                 radius;
-
-    if(mo->type == MT_GRENADE)
-        radius = 48;
-    else
-        radius = 128;
-    // < d64tc
-
-    //P_RadiusAttack(mo, mo->target, 128, 127); // jd64
-    P_RadiusAttack(mo, mo->target, radius, radius - 1);
+    P_RadiusAttack(mo, mo->target, 128, 127);
 }
 
 /**

Modified: trunk/doomsday/plugins/jdoom64/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_inter.c	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/src/p_inter.c	2008-06-14 02:15:34 UTC (rev 5709)
@@ -441,28 +441,6 @@
             ST_HUDUnHide(HUE_ON_PICKUP_ARMOR);
         break;
 
-    case SPR_BON3: // jd64
-        player->health += 2;
-        if(player->health > healthLimit)
-            player->health = healthLimit;
-        player->plr->mo->health = player->health;
-
-        player->armorPoints += 2;
-        if(player->armorPoints > armorPoints[1]) // 200
-            player->armorPoints = armorPoints[1];
-        if(!player->armorType)
-            player->armorType = armorClass[0];
-
-        player->update |= PSF_HEALTH | PSF_ARMOR_TYPE | PSF_ARMOR_POINTS;
-        P_SetMessage(player, GOTHELLBONUS, false);
-
-        // Maybe unhide the HUD?
-        if(player == &players[CONSOLEPLAYER])
-            ST_HUDUnHide(HUE_ON_PICKUP_HEALTH);
-        if(player == &players[CONSOLEPLAYER])
-            ST_HUDUnHide(HUE_ON_PICKUP_ARMOR);
-        break;
-
     case SPR_SOUL:
         player->health += soulSphereHealth;
         if(player->health > soulSphereLimit)
@@ -881,11 +859,6 @@
         item = MT_SHOTGUN;
         break;
 
-    //case MT_CHAINGUY:
-    case MT_CHAINGUNGUY: // jd64
-        item = MT_CHAINGUN;
-        break;
-
     default:
         return;
     }

Modified: trunk/doomsday/plugins/jdoom64/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_mobj.c	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/src/p_mobj.c	2008-06-14 02:15:34 UTC (rev 5709)
@@ -120,10 +120,6 @@
 
 void P_ExplodeMissile(mobj_t *mo)
 {
-    // DJS - FIXME??
-    if(mo->type == MT_GRENADE) // jd64
-        return;
-
     if(IS_CLIENT)
     {
         // Clients won't explode missiles.
@@ -479,16 +475,8 @@
     {
         // Hit the floor
         mo->pos[VZ] = mo->floorZ;
-        if(mo->type == MT_GRENADE)
-        {
-            P_BounceMissile(mo);
-            return;
-        }
-        else
-        {
-            P_ExplodeMissile(mo);
-            return;
-        }
+        P_ExplodeMissile(mo);
+        return;
     }
     // < d64tc
 
@@ -517,13 +505,7 @@
 
         if((mo->flags & MF_MISSILE) && !(mo->flags & MF_NOCLIP))
         {
-            // jd64 >
-            // DJS - FIXME!
-            if(mo->type == MT_GRENADE)
-                P_BounceMissile(mo);
-            else
-                P_ExplodeMissile(mo);
-            // < d64tc
+            P_ExplodeMissile(mo);
             return;
         }
     }
@@ -542,10 +524,7 @@
         }
         else
         {
-            if(mo->type == MT_GRENADE)
-                P_BounceMissile(mo);
-            else
-                P_ExplodeMissile(mo);
+            P_ExplodeMissile(mo);
             return;
         }
     }

Modified: trunk/doomsday/plugins/jdoom64/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_telept.c	2008-06-14 00:14:40 UTC (rev 5708)
+++ trunk/doomsday/plugins/jdoom64/src/p_telept.c	2008-06-14 02:15:34 UTC (rev 5709)
@@ -278,8 +278,6 @@
         {7628, MT_MISC9},
         {7629, MT_MISC6},
         {7630, MT_MISC7},
-        {7631, MT_CHAINGUNGUY},
-        {7632, MT_NIGHTCRAWLER},
         {-1, -1} // Terminator.
     };
     int                 i;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5720
          http://deng.svn.sourceforge.net/deng/?rev=5720&view=rev
Author:   danij
Date:     2008-06-14 17:38:57 -0700 (Sat, 14 Jun 2008)

Log Message:
-----------
jDoom64: Removed the Nightmare skill level as it is not in the original DOOM64.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/src/g_game.c
    trunk/doomsday/plugins/common/src/hu_menu.c
    trunk/doomsday/plugins/common/src/m_multi.c
    trunk/doomsday/plugins/jdoom64/defs/text.ded
    trunk/doomsday/plugins/jdoom64/include/d_config.h
    trunk/doomsday/plugins/jdoom64/include/d_englsh.h
    trunk/doomsday/plugins/jdoom64/include/doomdef.h
    trunk/doomsday/plugins/jdoom64/include/info.h
    trunk/doomsday/plugins/jdoom64/include/mn_def.h
    trunk/doomsday/plugins/jdoom64/src/d_console.c
    trunk/doomsday/plugins/jdoom64/src/d_main.c
    trunk/doomsday/plugins/jdoom64/src/m_cheat.c
    trunk/doomsday/plugins/jdoom64/src/p_enemy.c
    trunk/doomsday/plugins/jdoom64/src/p_inter.c
    trunk/doomsday/plugins/jdoom64/src/p_mobj.c

Modified: trunk/doomsday/plugins/common/src/g_game.c
===================================================================
--- trunk/doomsday/plugins/common/src/g_game.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/common/src/g_game.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -1945,8 +1945,8 @@
 
     if(skill < SM_BABY)
         skill = SM_BABY;
-    if(skill > SM_NIGHTMARE)
-        skill = SM_NIGHTMARE;
+    if(skill > NUM_SKILL_MODES - 1)
+        skill = NUM_SKILL_MODES - 1;
 
     // Make sure that the episode and map numbers are good.
     G_ValidateMap(&episode, &map);
@@ -1957,7 +1957,7 @@
     respawnMonsters = respawnParm;
 #endif
 
-#if __JDOOM__ || __JHERETIC__ || __JDOOM64__
+#if __JDOOM__ || __JHERETIC__
     // Is respawning enabled at all in nightmare skill?
     if(skill == SM_NIGHTMARE)
         respawnMonsters = cfg.respawnMonstersNightmare;
@@ -1966,7 +1966,11 @@
 //// \kludge Doom/Heretic Fast Monters/Missiles
 #if __JDOOM__ || __JDOOM64__
     // Fast monsters?
-    if(fastParm || (skill == SM_NIGHTMARE && gameSkill != SM_NIGHTMARE))
+    if(fastParm
+# if __JDOOM__
+        || (skill == SM_NIGHTMARE && gameSkill != SM_NIGHTMARE)
+# endif
+        )
     {
         for(i = S_SARG_RUN1; i <= S_SARG_RUN8; ++i)
             states[i].tics = 1;
@@ -1988,11 +1992,13 @@
 
     // Fast missiles?
 #if __JDOOM__ || __JHERETIC__ || __JDOOM64__
-#   if __JDOOM__ || __JDOOM64__
+# if __JDOOM64__
+    speed = fastParm;
+# elif __JDOOM__
     speed = (fastParm || (skill == SM_NIGHTMARE && gameSkill != SM_NIGHTMARE));
-#   else
+# else
     speed = skill == SM_NIGHTMARE;
-#   endif
+# endif
 
     for(i = 0; MonsterMissileInfo[i].type != -1; ++i)
     {

Modified: trunk/doomsday/plugins/common/src/hu_menu.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_menu.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/common/src/hu_menu.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -702,8 +702,27 @@
     LINEHEIGHT,
     0, 5
 };
-#elif __JDOOM__ || __JDOOM64__
+#elif __JDOOM64__
 static menuitem_t SkillItems[] = {
+    {ITT_EFUNC, 0, "I", M_ChooseSkill, 0, "M_JKILL"},
+    {ITT_EFUNC, 0, "H", M_ChooseSkill, 1, "M_ROUGH"},
+    {ITT_EFUNC, 0, "H", M_ChooseSkill, 2, "M_HURT"},
+    {ITT_EFUNC, 0, "U", M_ChooseSkill, 3, "M_ULTRA"},
+};
+static menu_t SkillDef = {
+    0,
+    48, 63,
+    M_DrawSkillMenu,
+    4, SkillItems,
+    2, MENU_MAIN,
+    huFontB,                    //1, 0, 0,
+    cfg.menuColor,
+    NULL,
+    LINEHEIGHT,
+    0, 4
+};
+#else __JDOOM__
+static menuitem_t SkillItems[] = {
     // Text defs TXT_SKILL1..5.
     {ITT_EFUNC, 0, "I", M_ChooseSkill, 0, "M_JKILL"},
     {ITT_EFUNC, 0, "H", M_ChooseSkill, 1, "M_ROUGH"},
@@ -717,11 +736,7 @@
     48, 63,
     M_DrawSkillMenu,
     5, SkillItems,
-# if __JDOOM64__
-    2, MENU_MAIN,
-# else
     2, MENU_EPISODE,
-# endif
     huFontB,                    //1, 0, 0,
     cfg.menuColor,
     NULL,
@@ -1345,7 +1360,7 @@
 
 #if __JDOOM__ || __JDOOM64__
     // Skill names.
-    for(i = 0, maxw = 0; i < 5; ++i)
+    for(i = 0, maxw = 0; i < NUM_SKILL_MODES; ++i)
     {
         SkillItems[i].text = GET_TXT(TXT_SKILL1 + i);
         w = M_StringWidth(SkillItems[i].text, SkillDef.font);
@@ -3678,17 +3693,16 @@
 }
 #endif
 
+#if __JDOOM__ || __JHERETIC__ || __JSTRIFE__ || __WOLFTC__
 boolean M_VerifyNightmare(int option, void *data)
 {
-#if __JDOOM__ || __JHERETIC__ || __JDOOM64__ || __JSTRIFE__
+#if __JDOOM__ || __JHERETIC__ || __JSTRIFE__
     if(messageResponse == 1) // Yes
     {
 #ifdef __JHERETIC__
         G_DeferedInitNew(SM_NIGHTMARE, MenuEpisode, 1);
 #elif __JDOOM__
         G_DeferedInitNew(SM_NIGHTMARE, epi + 1, 1);
-#elif __JDOOM64__
-        G_DeferedInitNew(SM_NIGHTMARE, 1, 1);
 #elif __JSTRIFE__
         G_DeferredNewGame(SM_NIGHTMARE);
 #endif
@@ -3706,8 +3720,8 @@
 #endif
     return false;
 }
+#endif
 
-
 void M_ChooseSkill(int option, void *data)
 {
 #if __JHEXEN__
@@ -3719,7 +3733,7 @@
     SB_state = -1;
 
 #else
-# if __JDOOM__ || __JDOOM64__ || __JSTRIFE__
+# if __JDOOM__ || __JSTRIFE__
     if(option == SM_NIGHTMARE)
     {
 #  if __JSTRIFE__

Modified: trunk/doomsday/plugins/common/src/m_multi.c
===================================================================
--- trunk/doomsday/plugins/common/src/m_multi.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/common/src/m_multi.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -364,13 +364,17 @@
 
 void DrawGameSetupMenu(void)
 {
-    char   *boolText[2] = { "NO", "YES" }, buf[50];
-    char   *skillText[5] = { "BABY", "EASY", "MEDIUM", "HARD", "NIGHTMARE" };
+    char   *boolText[] = { "NO", "YES" }, buf[50];
+#if __JDOOM__
+    char   *skillText[] = {"BABY", "EASY", "MEDIUM", "HARD", "NIGHTMARE" };
+#else
+    char   *skillText[] = {"BABY", "EASY", "MEDIUM", "HARD" };
+#endif
 #if __JDOOM__ || __JDOOM64__
     //char   *freeLookText[3] = { "NO", "NOT BFG", "ALL" };
-    char   *dmText[3] = { "COOPERATIVE", "DEATHMATCH 1", "DEATHMATCH 2" };
+    char   *dmText[] = { "COOPERATIVE", "DEATHMATCH 1", "DEATHMATCH 2" };
 #else
-    char   *dmText[3] = { "NO", "YES", "YES" };
+    char   *dmText[] = { "NO", "YES", "YES" };
 #endif
     menu_t *menu = &GameSetupMenu;
     int     idx;
@@ -714,7 +718,7 @@
 {
     if(option == RIGHT_DIR)
     {
-        if(cfg.netSkill < 4)
+        if(cfg.netSkill < NUM_SKILL_MODES - 1)
             cfg.netSkill++;
     }
     else if(cfg.netSkill > 0)

Modified: trunk/doomsday/plugins/jdoom64/defs/text.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/text.ded	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/defs/text.ded	2008-06-15 00:38:57 UTC (rev 5720)
@@ -58,12 +58,6 @@
 }
 
 Text {
-  ID = "NIGHTMARE";
-  Text = "are you sure? this skill level\nisn't even remotely fair.\n\n
-    press y or n.";
-}
-
-Text {
   ID = "MSGOFF";
   Text = "Messages OFF";
 }
@@ -1168,7 +1162,7 @@
 
 Text {
   ID = "SKILL1";
-  Text = "Be gentle!";
+  Text = "Be Gentle!";
 }
 
 Text {
@@ -1185,8 +1179,3 @@
   ID = "SKILL4";
   Text = "Watch me die!";
 }
-
-Text {
-  ID = "SKILL5";
-  Text = "Hell fears me!";
-}

Modified: trunk/doomsday/plugins/jdoom64/include/d_config.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/d_config.h	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/include/d_config.h	2008-06-15 00:38:57 UTC (rev 5720)
@@ -122,7 +122,6 @@
     byte            noCoopAnything;
     byte            noNetBFG;
     byte            coopRespawnItems;
-    byte            respawnMonstersNightmare;
 
     /**
      * Compatibility options.

Modified: trunk/doomsday/plugins/jdoom64/include/d_englsh.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/d_englsh.h	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/include/d_englsh.h	2008-06-15 00:38:57 UTC (rev 5720)
@@ -49,7 +49,6 @@
 #define QLPROMPT            GET_TXT(TXT_QLPROMPT)
 
 #define NEWGAME             GET_TXT(TXT_NEWGAME)
-#define NIGHTMARE           GET_TXT(TXT_NIGHTMARE)
 #define SWSTRING            GET_TXT(TXT_SWSTRING)
 #define MSGOFF              GET_TXT(TXT_MSGOFF)
 #define MSGON               GET_TXT(TXT_MSGON)
@@ -210,7 +209,6 @@
 #define CC_BARON            GET_TXT(TXT_CC_BARON)
 #define CC_ARACH            GET_TXT(TXT_CC_ARACH)
 #define CC_PAIN             GET_TXT(TXT_CC_PAIN)
-#define CC_REVEN            GET_TXT(TXT_CC_REVEN)
 #define CC_MANCU            GET_TXT(TXT_CC_MANCU)
 #define CC_CYBER            GET_TXT(TXT_CC_CYBER)
 #define CC_NTROOP           GET_TXT(TXT_CC_NTROOP) // jd64

Modified: trunk/doomsday/plugins/jdoom64/include/doomdef.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/doomdef.h	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/include/doomdef.h	2008-06-15 00:38:57 UTC (rev 5720)
@@ -155,7 +155,6 @@
     SM_EASY,
     SM_MEDIUM,
     SM_HARD,
-    SM_NIGHTMARE,
     NUM_SKILL_MODES
 } skillmode_t;
 

Modified: trunk/doomsday/plugins/jdoom64/include/info.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/info.h	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/include/info.h	2008-06-15 00:38:57 UTC (rev 5720)
@@ -1447,7 +1447,6 @@
     TXT_QSPROMPT,
     TXT_QLPROMPT,
     TXT_NEWGAME,
-    TXT_NIGHTMARE,
     TXT_MSGOFF,
     TXT_MSGON,
     TXT_NETEND,
@@ -1668,7 +1667,6 @@
     TXT_SKILL2,
     TXT_SKILL3,
     TXT_SKILL4,
-    TXT_SKILL5,
     NUMTEXT
 } textenum_t;
 

Modified: trunk/doomsday/plugins/jdoom64/include/mn_def.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/mn_def.h	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/include/mn_def.h	2008-06-15 00:38:57 UTC (rev 5720)
@@ -100,7 +100,7 @@
 } menutype_t;
 
 // Menu item flags
-#define MIF_NOTALTTXT           0x01 // Don't use alt text instead of lump (M_NMARE)
+#define MIF_NOTALTTXT           0x01 // Don't use alt text instead of lump.
 
 typedef struct {
     menuitemtype_t  type;

Modified: trunk/doomsday/plugins/jdoom64/src/d_console.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/d_console.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/src/d_console.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -123,8 +123,6 @@
     {"server-game-bfg-freeaim", 0, CVT_BYTE, &cfg.netBFGFreeLook, 0, 1},
     {"server-game-nomonsters", 0, CVT_BYTE, &cfg.netNoMonsters, 0, 1 },
     {"server-game-respawn", 0, CVT_BYTE, &cfg.netRespawn, 0, 1},
-    {"server-game-respawn-monsters-nightmare", 0, CVT_BYTE,
-        &cfg.respawnMonstersNightmare, 0, 1},
     {"server-game-radiusattack-nomaxz", 0, CVT_BYTE,
         &cfg.netNoMaxZRadiusAttack, 0, 1},
     {"server-game-monster-meleeattack-nomaxz", 0, CVT_BYTE,

Modified: trunk/doomsday/plugins/jdoom64/src/d_main.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/d_main.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/src/d_main.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -362,7 +362,6 @@
     cfg.bobView = 1;
     cfg.bobWeaponLower = true;
     cfg.cameraNoClip = true;
-    cfg.respawnMonstersNightmare = true;
 
     cfg.weaponOrder[0] = WT_TENTH;
     cfg.weaponOrder[1] = WT_SIXTH;

Modified: trunk/doomsday/plugins/jdoom64/src/m_cheat.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/m_cheat.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/src/m_cheat.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -170,13 +170,10 @@
 
     plyr = &players[CONSOLEPLAYER];
 
-    if(gameSkill != SM_NIGHTMARE &&
-       ev->type == EV_KEY && ev->state == EVS_DOWN)
+    if(ev->type == EV_KEY && ev->state == EVS_DOWN)
     {
         if(!IS_NETGAME)
         {
-            // if (gameSkill != SM_NIGHTMARE) {
-
             // 'dqd' cheat for toggleable god mode.
             if(Cht_CheckCheat(&cheat_god, ev->data1))
             {

Modified: trunk/doomsday/plugins/jdoom64/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_enemy.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/src/p_enemy.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -1039,7 +1039,7 @@
     if(actor->flags & MF_JUSTATTACKED)
     {
         actor->flags &= ~MF_JUSTATTACKED;
-        if(gameSkill != SM_NIGHTMARE && !fastParm)
+        if(!fastParm)
             newChaseDir(actor);
 
         return;
@@ -1058,7 +1058,7 @@
     // Check for missile attack.
     if(actor->info->missileState)
     {
-        if(!(gameSkill < SM_NIGHTMARE && !fastParm && actor->moveCount))
+        if(!(!fastParm && actor->moveCount))
         {
             if(checkMissileRange(actor))
             {
@@ -1976,92 +1976,14 @@
     if(bossKilled)
         return;
 
-    //if(gameMode == commercial) // jd64
-    {
-        /* d64tc
-        if(gameMap != 7)
-            return;
-        if((mo->type != MT_FATSO) && (mo->type != MT_BABY))
-            return;
-        */
+    if((gameMap != 1) && (gameMap != 30) && (gameMap != 32) &&
+       (gameMap != 33) && (gameMap != 35))
+        return;
 
-        // jd64 >
-        if((gameMap != 1) && (gameMap != 30) && (gameMap != 32) &&
-           (gameMap != 33) && (gameMap != 35))
-            return;
+    if((mo->type != MT_BITCH) && (mo->type != MT_CYBORG) &&
+       (mo->type != MT_BARREL) && (mo->type != MT_FATSO))
+        return;
 
-        if((mo->type != MT_BITCH) && (mo->type != MT_CYBORG) &&
-           (mo->type != MT_BARREL) && (mo->type != MT_FATSO))
-            return;
-        // < d64tc
-    }
-/* d64tc >
-    else
-    {
-        switch (gameEpisode)
-        {
-        case 1:
-            if(gameMap != 8)
-                return;
-
-            // Ultimate DOOM behavioral change
-            // This test was added so that the (variable) effects of the
-            // 666 special would only take effect when the last Baron
-            // died and not ANY monster.
-            // Many classic PWADS such as "Doomsday of UAC" (UAC_DEAD.wad)
-            // relied on the old behaviour and cannot be completed.
-
-            // Added compatibility option.
-            if(!cfg.anyBossDeath)
-                if(mo->type != MT_BRUISER)
-                    return;
-            break;
-
-        case 2:
-            if(gameMap != 8)
-                return;
-
-            if(mo->type != MT_CYBORG)
-                return;
-            break;
-
-        case 3:
-            if(gameMap != 8)
-                return;
-
-            if(mo->type != MT_SPIDER)
-                return;
-
-            break;
-
-        case 4:
-            switch (gameMap)
-            {
-            case 6:
-                if(mo->type != MT_CYBORG)
-                    return;
-                break;
-
-            case 8:
-                if(mo->type != MT_SPIDER)
-                    return;
-                break;
-
-            default:
-                return;
-                break;
-            }
-            break;
-
-        default:
-            if(gameMap != 8)
-                return;
-            break;
-        }
-
-    }
-< d64tc */
-
     // Make sure there is a player alive for victory.
     for(i = 0; i < MAXPLAYERS; ++i)
         if(players[i].plr->inGame && players[i].health > 0)
@@ -2080,7 +2002,6 @@
         return;
     }
 
-    // jd64 >
     if(gameMap == 1)
     {
         if(mo->type == MT_BARREL)
@@ -2124,75 +2045,6 @@
             G_LeaveLevel(G_GetLevelNumber(gameEpisode, gameMap), 0, false);
         }
     }
-    // < d64tc
-
-/* d64tc >
-    // victory!
-    if(gameMode == commercial)
-    {
-        if(gameMap == 7)
-        {
-            if(mo->type == MT_FATSO)
-            {
-                dummyLine = P_AllocDummyLine();
-                P_ToXLine(dummyLine)->tag = 666;
-                EV_DoFloor(dummyLine, FT_LOWERTOLOWEST);
-                P_FreeDummyLine(dummyLine);
-                return;
-            }
-
-            if(mo->type == MT_BABY)
-            {
-                dummyLine = P_AllocDummyLine();
-                P_ToXLine(dummyLine)->tag = 667;
-                EV_DoFloor(dummyLine, FT_RAISETOTEXTURE);
-                P_FreeDummyLine(dummyLine);
-
-                // Only activate once (rare Dead simple bug)
-                bossKilled = true;
-                return;
-            }
-        }
-    }
-    else
-    {
-        switch (gameEpisode)
-        {
-        case 1:
-            dummyLine = P_AllocDummyLine();
-            P_ToXLine(dummyLine)->tag = 666;
-            EV_DoFloor(dummyLine, FT_LOWERTOLOWEST);
-            P_FreeDummyLine(dummyLine);
-            bossKilled = true;
-            return;
-            break;
-
-        case 4:
-            switch (gameMap)
-            {
-            case 6:
-                dummyLine = P_AllocDummyLine();
-                P_ToXLine(dummyLine)->tag = 666;
-                EV_DoDoor(dummyLine, DT_BLAZEOPEN);
-                P_FreeDummyLine(dummyLine);
-                bossKilled = true;
-                return;
-                break;
-
-            case 8:
-                dummyLine = P_AllocDummyLine();
-                P_ToXLine(dummyLine)->tag = 666;
-                EV_DoFloor(dummyLine, FT_LOWERTOLOWEST);
-                P_FreeDummyLine(dummyLine);
-                bossKilled = true;
-                return;
-                break;
-            }
-        }
-    }
-
-    G_LeaveLevel(G_GetLevelNumber(gameEpisode, gameMap), 0, false);
-*/
 }
 
 void C_DECL A_Hoof(mobj_t *mo)

Modified: trunk/doomsday/plugins/jdoom64/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_inter.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/src/p_inter.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -92,10 +92,9 @@
     else
         num = clipAmmo[ammo] / 2;
 
-    if(gameSkill == SM_BABY || gameSkill == SM_NIGHTMARE)
+    if(gameSkill == SM_BABY)
     {
-        // give double ammo in trainer mode,
-        // you'll need in nightmare
+        // Give double ammo in trainer mode.
         num <<= 1;
     }
 

Modified: trunk/doomsday/plugins/jdoom64/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_mobj.c	2008-06-14 21:01:04 UTC (rev 5719)
+++ trunk/doomsday/plugins/jdoom64/src/p_mobj.c	2008-06-15 00:38:57 UTC (rev 5720)
@@ -917,9 +917,7 @@
     // Let the engine know about solid objects.
     P_SetDoomsdayFlags(mo);
 
-    if(gameSkill != SM_NIGHTMARE)
-        mo->reactionTime = info->reactionTime;
-
+    mo->reactionTime = info->reactionTime;
     mo->lastLook = P_Random() % MAXPLAYERS;
 
     // Do not set the state with P_MobjChangeState, because action routines
@@ -1231,8 +1229,6 @@
     // Check for apropriate skill level.
     if(gameSkill == SM_BABY)
         bit = 1;
-    else if(gameSkill == SM_NIGHTMARE)
-        bit = 4;
     else
         bit = 1 << (gameSkill - 1);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5739
          http://deng.svn.sourceforge.net/deng/?rev=5739&view=rev
Author:   danij
Date:     2008-06-25 13:31:09 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
All Games: Moved the macro INRANGEOF into doomdef.h/h2def.h

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/include/doomdef.h
    trunk/doomsday/plugins/jdoom64/include/doomdef.h
    trunk/doomsday/plugins/jheretic/include/doomdef.h
    trunk/doomsday/plugins/jhexen/include/h2def.h
    trunk/doomsday/plugins/wolftc/include/doomdef.h

Modified: trunk/doomsday/plugins/jdoom/include/doomdef.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/doomdef.h	2008-06-25 20:20:44 UTC (rev 5738)
+++ trunk/doomsday/plugins/jdoom/include/doomdef.h	2008-06-25 20:31:09 UTC (rev 5739)
@@ -72,6 +72,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max)  (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 /**
  * Game mode handling - identify IWAD version to handle IWAD dependant

Modified: trunk/doomsday/plugins/jdoom64/include/doomdef.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/doomdef.h	2008-06-25 20:20:44 UTC (rev 5738)
+++ trunk/doomsday/plugins/jdoom64/include/doomdef.h	2008-06-25 20:31:09 UTC (rev 5739)
@@ -68,6 +68,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max)  (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 /**
  * Game mode handling - identify IWAD version to handle IWAD dependant

Modified: trunk/doomsday/plugins/jheretic/include/doomdef.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/doomdef.h	2008-06-25 20:20:44 UTC (rev 5738)
+++ trunk/doomsday/plugins/jheretic/include/doomdef.h	2008-06-25 20:31:09 UTC (rev 5739)
@@ -74,6 +74,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max) (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 extern game_import_t gi;
 extern game_export_t gx;

Modified: trunk/doomsday/plugins/jhexen/include/h2def.h
===================================================================
--- trunk/doomsday/plugins/jhexen/include/h2def.h	2008-06-25 20:20:44 UTC (rev 5738)
+++ trunk/doomsday/plugins/jhexen/include/h2def.h	2008-06-25 20:31:09 UTC (rev 5739)
@@ -79,6 +79,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max)  (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 extern game_import_t gi;
 extern game_export_t gx;

Modified: trunk/doomsday/plugins/wolftc/include/doomdef.h
===================================================================
--- trunk/doomsday/plugins/wolftc/include/doomdef.h	2008-06-25 20:20:44 UTC (rev 5738)
+++ trunk/doomsday/plugins/wolftc/include/doomdef.h	2008-06-25 20:31:09 UTC (rev 5739)
@@ -57,6 +57,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max) (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 extern game_import_t gi;
 extern game_export_t gx;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5742
          http://deng.svn.sourceforge.net/deng/?rev=5742&view=rev
Author:   danij
Date:     2008-06-25 13:55:27 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
All Games: Revised WI_DrawPatch to take a ptr to dpatch_t rather than a lump num. This has the knock on effect that to use this routine, a patch must have been R_CachePatch'd first.
Also fixed the issue with the HUD text type in timer not being updated when the menu is closed/inactive.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/include/hu_stuff.h
    trunk/doomsday/plugins/common/include/r_common.h
    trunk/doomsday/plugins/common/src/am_map.c
    trunk/doomsday/plugins/common/src/hu_menu.c
    trunk/doomsday/plugins/common/src/hu_stuff.c
    trunk/doomsday/plugins/common/src/r_common.c
    trunk/doomsday/plugins/common/src/st_lib.c
    trunk/doomsday/plugins/jdoom/include/mn_def.h
    trunk/doomsday/plugins/jdoom/src/d_refresh.c
    trunk/doomsday/plugins/jdoom/src/wi_stuff.c
    trunk/doomsday/plugins/jdoom64/include/mn_def.h
    trunk/doomsday/plugins/jdoom64/src/d_refresh.c
    trunk/doomsday/plugins/jdoom64/src/wi_stuff.c
    trunk/doomsday/plugins/jheretic/include/mn_def.h
    trunk/doomsday/plugins/jhexen/include/mn_def.h
    trunk/doomsday/plugins/jhexen/src/hrefresh.c

Modified: trunk/doomsday/plugins/common/include/hu_stuff.h
===================================================================
--- trunk/doomsday/plugins/common/include/hu_stuff.h	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/common/include/hu_stuff.h	2008-06-25 20:55:27 UTC (rev 5742)
@@ -60,8 +60,17 @@
 extern dpatch_t huFont[HU_FONTSIZE];
 extern dpatch_t huFontA[HU_FONTSIZE], huFontB[HU_FONTSIZE];
 
-// Name graphics of each level (centered)
-extern dpatch_t *levelNamePatches;
+// Name graphics of each level.
+extern dpatch_t* levelNamePatches;
+// Name graphics of each skill mode.
+#if __JDOOM__ || __JDOOM64__
+extern dpatch_t skillModeNames[NUM_SKILL_MODES];
+extern dpatch_t m_pause; // Paused graphic.
+#endif
+// Name graphics of each episode.
+#if __JDOOM__ || __WOLFTC__
+extern dpatch_t *episodeNamePatches;
+#endif
 
 extern boolean messageNoEcho;
 extern int typeInTime;
@@ -80,7 +89,7 @@
 
 // Implements patch replacement.
 void        WI_DrawPatch(int x, int y, float r, float g, float b, float a,
-                         int lump, char *altstring, boolean builtin, int halign);
+                         dpatch_t* patch, char *altstring, boolean builtin, int halign);
 
 void        WI_DrawParamText(int x, int y, char *string, dpatch_t * defFont,
                              float defRed, float defGreen, float defBlue,

Modified: trunk/doomsday/plugins/common/include/r_common.h
===================================================================
--- trunk/doomsday/plugins/common/include/r_common.h	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/common/include/r_common.h	2008-06-25 20:55:27 UTC (rev 5742)
@@ -54,7 +54,7 @@
 boolean         R_MapObscures(int playerid, int x, int y, int w, int h);
 
 void            R_PrecachePSprites(void);
-void            R_CachePatch(dpatch_t *dp, char *name);
+void            R_CachePatch(dpatch_t* dp, const char* name);
 
 void            R_GetGammaMessageStrings(void);
 void            R_CycleGammaLevel(void);

Modified: trunk/doomsday/plugins/common/src/am_map.c
===================================================================
--- trunk/doomsday/plugins/common/src/am_map.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/common/src/am_map.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -3134,7 +3134,7 @@
             float               x, y, w, h, spacing, scale, iconAlpha;
             spriteinfo_t        sprInfo;
             int                 artifactSprites[NUMARTIFACTS] = {
-                SPR_POW1, SPR_POW2, SPR_POW3
+                SPR_ART1, SPR_ART2, SPR_ART3
             };
 
             iconAlpha = map->alpha;
@@ -3225,7 +3225,7 @@
     char               *lname;
     automap_t          *map = &automaps[mapviewplayer];
     automapwindow_t    *win = &map->window;
-    int                 lumpNum = -1;
+    dpatch_t*           patch = NULL;
 #if __JDOOM__ || __JDOOM64__
     int                 mapNum;
 #endif
@@ -3237,14 +3237,14 @@
         // Compose the mapnumber used to check the map name patches array.
 #if __JDOOM64__
         mapNum = gameMap -1;
-        lumpNum = levelNamePatches[mapNum].lump;
+        patch = &levelNamePatches[mapNum];
 #elif __JDOOM__
         if(gameMode == commercial)
             mapNum = gameMap -1;
         else
             mapNum = ((gameEpisode -1) * 9) + gameMap -1;
 
-        lumpNum = levelNamePatches[mapNum].lump;
+        patch = &levelNamePatches[mapNum];
 #endif
 
         DGL_MatrixMode(DGL_PROJECTION);
@@ -3280,8 +3280,8 @@
 
         Draw_BeginZoom(.4f, x, y);
         y -= 24; // border
-        WI_DrawPatch(x, y, 1, 1, 1, map->alpha, lumpNum,
-                     lname, false, ALIGN_CENTER);
+        WI_DrawPatch(x, y, 1, 1, 1, map->alpha, patch, lname, false,
+                     ALIGN_CENTER);
         Draw_EndZoom();
 
         DGL_MatrixMode(DGL_PROJECTION);

Modified: trunk/doomsday/plugins/common/src/hu_menu.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_menu.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/common/src/hu_menu.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -399,15 +399,39 @@
 #define READTHISID          (3)
 #endif
 
+#if __JDOOM__ || __JDOOM64__
+static dpatch_t m_doom;
+static dpatch_t m_newg;
+static dpatch_t m_skill;
+static dpatch_t m_episod;
+static dpatch_t m_ngame;
+static dpatch_t m_option;
+static dpatch_t m_loadg;
+static dpatch_t m_saveg;
+static dpatch_t m_rdthis;
+static dpatch_t m_quitg;
+static dpatch_t m_optttl;
+# if __JDOOM__
+static dpatch_t credit;
+static dpatch_t help;
+static dpatch_t help1;
+static dpatch_t help2;
+# endif
+#endif
+
+#if __JHERETIC__ || __JHEXEN__
+static dpatch_t m_htic;
+#endif
+
 menuitem_t MainItems[] = {
 #if __JDOOM__
-    {ITT_EFUNC, 0, "{case}New Game", M_NewGame, 0, "M_NGAME"},
+    {ITT_EFUNC, 0, "{case}New Game", M_NewGame, 0, &m_ngame},
     {ITT_EFUNC, 0, "{case}Multiplayer", SCEnterMultiplayerMenu, 0},
-    {ITT_SETMENU, 0, "{case}Options", NULL, MENU_OPTIONS, "M_OPTION" },
-    {ITT_EFUNC, 0, "{case}Load Game", M_LoadGame, 0, "M_LOADG"},
-    {ITT_EFUNC, 0, "{case}Save Game", M_SaveGame, 0, "M_SAVEG"},
-    {ITT_EFUNC, 0, "{case}Read This!", M_ReadThis, 0, "M_RDTHIS"},
-    {ITT_EFUNC, 0, "{case}Quit Game", M_QuitDOOM, 0, "M_QUITG"}
+    {ITT_SETMENU, 0, "{case}Options", NULL, MENU_OPTIONS, &m_option},
+    {ITT_EFUNC, 0, "{case}Load Game", M_LoadGame, 0, &m_loadg},
+    {ITT_EFUNC, 0, "{case}Save Game", M_SaveGame, 0, &m_saveg},
+    {ITT_EFUNC, 0, "{case}Read This!", M_ReadThis, 0, &m_rdthis},
+    {ITT_EFUNC, 0, "{case}Quit Game", M_QuitDOOM, 0, &m_quitg}
 #elif __JDOOM64__
     {ITT_EFUNC, 0, "{case}New Game", M_NewGame, 0},
     {ITT_EFUNC, 0, "{case}Multiplayer", SCEnterMultiplayerMenu, 0},
@@ -537,10 +561,10 @@
 #elif __JDOOM__
 menuitem_t EpisodeItems[] = {
     // Text defs TXT_EPISODE1..4.
-    {ITT_EFUNC, 0, "K", M_Episode, 0, "M_EPI1" },
-    {ITT_EFUNC, 0, "T", M_Episode, 1, "M_EPI2" },
-    {ITT_EFUNC, 0, "I", M_Episode, 2, "M_EPI3" },
-    {ITT_EFUNC, 0, "T", M_Episode, 3, "M_EPI4" }
+    {ITT_EFUNC, 0, "K", M_Episode, 0},
+    {ITT_EFUNC, 0, "T", M_Episode, 1},
+    {ITT_EFUNC, 0, "I", M_Episode, 2},
+    {ITT_EFUNC, 0, "T", M_Episode, 3}
 };
 
 menu_t  EpiDef = {
@@ -579,15 +603,15 @@
 #endif
 
 static menuitem_t LoadItems[] = {
-    {ITT_EFUNC, 0, "1", M_LoadSelect, 0, ""},
-    {ITT_EFUNC, 0, "2", M_LoadSelect, 1, ""},
-    {ITT_EFUNC, 0, "3", M_LoadSelect, 2, ""},
-    {ITT_EFUNC, 0, "4", M_LoadSelect, 3, ""},
-    {ITT_EFUNC, 0, "5", M_LoadSelect, 4, ""},
-    {ITT_EFUNC, 0, "6", M_LoadSelect, 5, ""},
+    {ITT_EFUNC, 0, "1", M_LoadSelect, 0},
+    {ITT_EFUNC, 0, "2", M_LoadSelect, 1},
+    {ITT_EFUNC, 0, "3", M_LoadSelect, 2},
+    {ITT_EFUNC, 0, "4", M_LoadSelect, 3},
+    {ITT_EFUNC, 0, "5", M_LoadSelect, 4},
+    {ITT_EFUNC, 0, "6", M_LoadSelect, 5},
 #if __JDOOM__ || __JHERETIC__ || __JDOOM64__
-    {ITT_EFUNC, 0, "7", M_LoadSelect, 6, ""},
-    {ITT_EFUNC, 0, "8", M_LoadSelect, 7, ""}
+    {ITT_EFUNC, 0, "7", M_LoadSelect, 6},
+    {ITT_EFUNC, 0, "8", M_LoadSelect, 7}
 #endif
 };
 
@@ -609,15 +633,15 @@
 };
 
 static menuitem_t SaveItems[] = {
-    {ITT_EFUNC, 0, "1", M_SaveSelect, 0, ""},
-    {ITT_EFUNC, 0, "2", M_SaveSelect, 1, ""},
-    {ITT_EFUNC, 0, "3", M_SaveSelect, 2, ""},
-    {ITT_EFUNC, 0, "4", M_SaveSelect, 3, ""},
-    {ITT_EFUNC, 0, "5", M_SaveSelect, 4, ""},
-    {ITT_EFUNC, 0, "6", M_SaveSelect, 5, ""},
+    {ITT_EFUNC, 0, "1", M_SaveSelect, 0},
+    {ITT_EFUNC, 0, "2", M_SaveSelect, 1},
+    {ITT_EFUNC, 0, "3", M_SaveSelect, 2},
+    {ITT_EFUNC, 0, "4", M_SaveSelect, 3},
+    {ITT_EFUNC, 0, "5", M_SaveSelect, 4},
+    {ITT_EFUNC, 0, "6", M_SaveSelect, 5},
 #if __JDOOM__ || __JHERETIC__ || __JDOOM64__
-    {ITT_EFUNC, 0, "7", M_SaveSelect, 6, ""},
-    {ITT_EFUNC, 0, "8", M_SaveSelect, 7, ""}
+    {ITT_EFUNC, 0, "7", M_SaveSelect, 6},
+    {ITT_EFUNC, 0, "8", M_SaveSelect, 7}
 #endif
 };
 
@@ -704,10 +728,10 @@
 };
 #elif __JDOOM64__
 static menuitem_t SkillItems[] = {
-    {ITT_EFUNC, 0, "I", M_ChooseSkill, 0, "M_JKILL"},
-    {ITT_EFUNC, 0, "H", M_ChooseSkill, 1, "M_ROUGH"},
-    {ITT_EFUNC, 0, "H", M_ChooseSkill, 2, "M_HURT"},
-    {ITT_EFUNC, 0, "U", M_ChooseSkill, 3, "M_ULTRA"},
+    {ITT_EFUNC, 0, "I", M_ChooseSkill, 0, &skillModeNames[0]},
+    {ITT_EFUNC, 0, "H", M_ChooseSkill, 1, &skillModeNames[1]},
+    {ITT_EFUNC, 0, "H", M_ChooseSkill, 2, &skillModeNames[2]},
+    {ITT_EFUNC, 0, "U", M_ChooseSkill, 3, &skillModeNames[3]},
 };
 static menu_t SkillDef = {
     0,
@@ -724,11 +748,11 @@
 #else __JDOOM__
 static menuitem_t SkillItems[] = {
     // Text defs TXT_SKILL1..5.
-    {ITT_EFUNC, 0, "I", M_ChooseSkill, 0, "M_JKILL"},
-    {ITT_EFUNC, 0, "H", M_ChooseSkill, 1, "M_ROUGH"},
-    {ITT_EFUNC, 0, "H", M_ChooseSkill, 2, "M_HURT"},
-    {ITT_EFUNC, 0, "U", M_ChooseSkill, 3, "M_ULTRA"},
-    {ITT_EFUNC, MIF_NOTALTTXT, "N", M_ChooseSkill, 4, "M_NMARE"}
+    {ITT_EFUNC, 0, "I", M_ChooseSkill, 0, &skillModeNames[0]},
+    {ITT_EFUNC, 0, "H", M_ChooseSkill, 1, &skillModeNames[1]},
+    {ITT_EFUNC, 0, "H", M_ChooseSkill, 2, &skillModeNames[2]},
+    {ITT_EFUNC, 0, "U", M_ChooseSkill, 3, &skillModeNames[3]},
+    {ITT_EFUNC, MIF_NOTALTTXT, "N", M_ChooseSkill, 4, &skillModeNames[4]}
 };
 
 static menu_t SkillDef = {
@@ -1072,7 +1096,7 @@
     {ITT_EFUNC, 0, "MONSTERS CAN GET STUCK IN DOORS :", M_ToggleVar, 0, NULL,
         "game-monsters-stuckindoors"},
     {ITT_EFUNC, 0, "SOME OBJECTS NEVER HANG OVER LEDGES :", M_ToggleVar, 0, NULL,
-        "game-objects-hangoverledges"},
+        "game-objects-neverhangoverledges"},
     {ITT_EFUNC, 0, "OBJECTS FALL UNDER OWN WEIGHT :", M_ToggleVar, 0, NULL,
         "game-objects-falloff"},
     {ITT_EFUNC, 0, "CORPSES SLIDE DOWN STAIRS :", M_ToggleVar, 0, NULL,
@@ -1281,6 +1305,34 @@
         R_CachePatch(&cursorst[i], buffer);
     }
 
+#if __JDOOM__ || __JDOOM64__
+    R_CachePatch(&m_doom, "M_DOOM");
+    R_CachePatch(&m_newg, "M_NEWG");
+    R_CachePatch(&m_skill, "M_SKILL");
+    R_CachePatch(&m_episod, "M_EPISOD");
+    R_CachePatch(&m_ngame, "M_NGAME");
+    R_CachePatch(&m_option, "M_OPTION");
+    R_CachePatch(&m_loadg, "M_LOADG");
+    R_CachePatch(&m_saveg, "M_SAVEG");
+    R_CachePatch(&m_rdthis, "M_RDTHIS");
+    R_CachePatch(&m_quitg, "M_QUITG");
+    R_CachePatch(&m_optttl, "M_OPTTTL");
+# if __JDOOM__
+    if(gameMode == retail || gameMode == commercial)
+        R_CachePatch(&credit, "CREDIT");
+    if(gameMode == commercial)
+        R_CachePatch(&help, "HELP");
+    if(gameMode == shareware || gameMode == registered || gameMode == retail)
+        R_CachePatch(&help1, "HELP1");
+    if(gameMode == shareware || gameMode == registered)
+        R_CachePatch(&help2, "HELP2");
+# endif
+#endif
+
+#if __JHERETIC__ || __JHEXEN__
+    R_CachePatch(&m_htic, "M_HTIC");
+#endif
+
     if(!menuFogData.texture && !Get(DD_NOVIDEO))
     {
         menuFogData.texture =
@@ -1351,6 +1403,8 @@
         w = M_StringWidth(EpisodeItems[i].text, EpiDef.font);
         if(w > maxw)
             maxw = w;
+
+        EpisodeItems[i].patch = &episodeNamePatches[i];
     }
     // Center the episodes menu appropriately.
     EpiDef.x = 160 - maxw / 2 + 12;
@@ -1411,7 +1465,7 @@
         item = &MainItems[READTHISID];
         item->func = M_QuitDOOM;
         item->text = "{case}Quit Game";
-        item->lumpname = "M_QUITG";
+        item->patch = &m_quitg;
         MainDef.itemCount = 6;
         MainDef.y = 64 + 8;
         SkillDef.prevMenu = MENU_MAIN;
@@ -1429,7 +1483,7 @@
         item = &MainItems[READTHISID];
         item->func = M_ReadThis;
         item->text = "{case}Read This!";
-        item->lumpname = "M_RDTHIS";
+        item->patch = &m_rdthis;
         MainDef.itemCount = 7;
         MainDef.y = 64;
         break;
@@ -1502,6 +1556,8 @@
     if(!M_RunTrigger(&fixed, time))
         return;
 
+    typeInTime++;
+
     // Check if there has been a response to a message
     if(messageToPrint)
     {
@@ -1568,8 +1624,6 @@
             }
         }
 
-        typeInTime++;
-
         // Fade in/out the widget background filter
         if(widgetEdit)
         {
@@ -1907,15 +1961,12 @@
 #if __JDOOM__ || __JDOOM64__
             }
 #endif
-            if(currentMenu->items[i].lumpname)
+            if(currentMenu->items[i].patch)
             {
-                if(currentMenu->items[i].lumpname[0])
-                {
-                    WI_DrawPatch(pos[VX], pos[VY], r, g, b, menuAlpha,
-                                W_GetNumForName(currentMenu->items[i].lumpname),
-                                (currentMenu->items[i].flags & MIF_NOTALTTXT)? NULL :
-                                 currentMenu->items[i].text, true, ALIGN_LEFT);
-                }
+                WI_DrawPatch(pos[VX], pos[VY], r, g, b, menuAlpha,
+                             currentMenu->items[i].patch,
+                             (currentMenu->items[i].flags & MIF_NOTALTTXT)? NULL :
+                             currentMenu->items[i].text, true, ALIGN_LEFT);
             }
             else if(currentMenu->items[i].text)
             {
@@ -2540,19 +2591,19 @@
     frame = (menuTime / 5) % 7;
 
     DGL_Color4f( 1, 1, 1, menuAlpha);
-    GL_DrawPatch_CS(88, 0, W_GetNumForName("M_HTIC"));
+    GL_DrawPatch_CS(88, 0, m_htic.lump);
     GL_DrawPatch_CS(37, 80, SkullBaseLump + (frame + 2) % 7);
     GL_DrawPatch_CS(278, 80, SkullBaseLump + frame);
 
 #elif __JHERETIC__
-    WI_DrawPatch(88, 0, 1, 1, 1, menuAlpha, W_GetNumForName("M_HTIC"),
-                 NULL, false, ALIGN_LEFT);
+    WI_DrawPatch(88, 0, 1, 1, 1, menuAlpha, &m_htic, NULL, false,
+                 ALIGN_LEFT);
 
     DGL_Color4f( 1, 1, 1, menuAlpha);
     GL_DrawPatch_CS(40, 10, SkullBaseLump + (17 - frame));
     GL_DrawPatch_CS(232, 10, SkullBaseLump + frame);
 #elif __JDOOM__ || __JDOOM64__
-    WI_DrawPatch(94, 2, 1, 1, 1, menuAlpha, W_GetNumForName("M_DOOM"),
+    WI_DrawPatch(94, 2, 1, 1, 1, menuAlpha, &m_doom,
                  NULL, false, ALIGN_LEFT);
 #elif __JSTRIFE__
     menu_t     *menu = &MainDef;
@@ -2618,7 +2669,7 @@
     M_DrawTitle("WHICH EPISODE?", 4);
 #elif __JDOOM__
     WI_DrawPatch(50, 40, menu->color[0], menu->color[1], menu->color[2], menuAlpha,
-                 W_GetNumForName("M_EPISOD"), "{case}Which Episode{scaley=1.25,y=-3}?",
+                 &m_episod, "{case}Which Episode{scaley=1.25,y=-3}?",
                  true, ALIGN_LEFT);
 #endif
 }
@@ -2633,9 +2684,9 @@
 #elif __JDOOM__ || __JDOOM64__
     menu_t *menu = &SkillDef;
     WI_DrawPatch(96, 14, menu->color[0], menu->color[1], menu->color[2], menuAlpha,
-                 W_GetNumForName("M_NEWG"), "{case}NEW GAME", true, ALIGN_LEFT);
+                 &m_newg, "{case}NEW GAME", true, ALIGN_LEFT);
     WI_DrawPatch(54, 38, menu->color[0], menu->color[1], menu->color[2], menuAlpha,
-                 W_GetNumForName("M_SKILL"), "{case}Choose Skill Level:", true,
+                 &m_skill, "{case}Choose Skill Level:", true,
                  ALIGN_LEFT);
 #endif
 }
@@ -2685,7 +2736,7 @@
     M_DrawTitle("LOAD GAME", 4);
 #else
     WI_DrawPatch(72, 28, menu->color[0], menu->color[1], menu->color[2], menuAlpha,
-                 W_GetNumForName("M_LOADG"), "{case}LOAD GAME", true, ALIGN_LEFT);
+                 &m_loadg, "{case}LOAD GAME", true, ALIGN_LEFT);
 #endif
     for(i = 0; i < NUMSAVESLOTS; ++i)
     {
@@ -2708,7 +2759,7 @@
     M_DrawTitle("SAVE GAME", 4);
 #else
     WI_DrawPatch(72, 28, menu->color[0], menu->color[1], menu->color[2], menuAlpha,
-                 W_GetNumForName("M_SAVEG"), "{case}SAVE GAME", true, ALIGN_LEFT);
+                 &m_saveg, "{case}SAVE GAME", true, ALIGN_LEFT);
 #endif
 
     for(i = 0; i < NUMSAVESLOTS; ++i)
@@ -2899,15 +2950,13 @@
     switch(gameMode)
     {
     case commercial:
-        WI_DrawPatch(0, 0, 1, 1, 1, 1, W_GetNumForName("HELP"), NULL,
-                     false, ALIGN_LEFT);
+        WI_DrawPatch(0, 0, 1, 1, 1, 1, &help, NULL, false, ALIGN_LEFT);
         break;
 
     case shareware:
     case registered:
     case retail:
-        WI_DrawPatch(0, 0, 1, 1, 1, 1, W_GetNumForName("HELP1"), NULL,
-                     false, ALIGN_LEFT);
+        WI_DrawPatch(0, 0, 1, 1, 1, 1, &help1, NULL, false, ALIGN_LEFT);
         break;
 
     default:
@@ -2927,13 +2976,11 @@
     case retail:
     case commercial:
         // This hack keeps us from having to change menus.
-        WI_DrawPatch(0, 0, 1, 1, 1, 1, W_GetNumForName("CREDIT"), NULL,
-                     false, ALIGN_LEFT);
+        WI_DrawPatch(0, 0, 1, 1, 1, 1, &credit, NULL, false, ALIGN_LEFT);
         break;
     case shareware:
     case registered:
-        WI_DrawPatch(0, 0, 1, 1, 1, 1, W_GetNumForName("HELP2"), NULL,
-                     false, ALIGN_LEFT);
+        WI_DrawPatch(0, 0, 1, 1, 1, 1, &help2, NULL, false, ALIGN_LEFT);
         break;
     default:
         break;
@@ -2955,20 +3002,20 @@
 void M_DrawOptions(void)
 {
 #if __JHERETIC__ || __JHEXEN__ || __JSTRIFE__
-    WI_DrawPatch(88, 0, 1, 1, 1, menuAlpha, W_GetNumForName("M_HTIC"),
-                 NULL, false, ALIGN_LEFT);
+    WI_DrawPatch(88, 0, 1, 1, 1, menuAlpha, &m_htic, NULL, false,
+                 ALIGN_LEFT);
 
     M_DrawTitle("OPTIONS", 56);
 #else
-    WI_DrawPatch(94, 2, 1, 1, 1, menuAlpha, W_GetNumForName("M_DOOM"),
-                 NULL, false, ALIGN_LEFT);
+    WI_DrawPatch(94, 2, 1, 1, 1, menuAlpha, &m_doom, NULL, false,
+                 ALIGN_LEFT);
 # if __JDOOM64__
     WI_DrawPatch(160, 64, cfg.menuColor[0], cfg.menuColor[1], cfg.menuColor[2],
                  menuAlpha, 0, "{case}OPTIONS",
                  true, ALIGN_CENTER);
 #else
     WI_DrawPatch(160, 64, cfg.menuColor[0], cfg.menuColor[1], cfg.menuColor[2],
-                 menuAlpha, W_GetNumForName("M_OPTTTL"), "{case}OPTIONS",
+                 menuAlpha, &m_optttl, "{case}OPTIONS",
                  true, ALIGN_CENTER);
 # endif
 #endif

Modified: trunk/doomsday/plugins/common/src/hu_stuff.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_stuff.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/common/src/hu_stuff.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -97,10 +97,18 @@
 int typeInTime = 0;
 
 #if __JDOOM__ || __JDOOM64__
- // Name graphics of each level (centered)
-dpatch_t *levelNamePatches;
+// Name graphics of each level.
+dpatch_t *levelNamePatches = NULL;
+// Name graphics of each skill mode.
+dpatch_t skillModeNames[NUM_SKILL_MODES];
+dpatch_t m_pause; // Paused graphic.
 #endif
 
+#if __JDOOM__ || __WOLFTC__
+// Name graphics of each episode.
+dpatch_t *episodeNamePatches = NULL;
+#endif
+
 boolean huShowAllFrags = false;
 
 cvar_t hudCVars[] = {
@@ -143,8 +151,28 @@
 
 #if __JDOOM__ || __JDOOM64__
     char                name[9];
+    static const char*  skillModePatchNames[] =
+    {
+        "M_JKILL",
+        "M_ROUGH",
+        "M_HURT",
+        "M_ULTRA",
+# if __JDOOM__
+        "M_NMARE"
+# endif
+    };
 #endif
 
+#if __JDOOM__ || __WOLFTC__
+    static const char*  episodePatchNames[] =
+    {
+        "M_EPI1",
+        "M_EPI2",
+        "M_EPI3",
+        "M_EPI4"
+    };
+#endif
+
     // Load the border patches
     for(i = 1; i < 9; ++i)
         R_CachePatch(&borderPatches[i-1], borderLumps[i]);
@@ -178,9 +206,17 @@
             memcpy(&huFontB[0 + i], &huFontB[4], sizeof(dpatch_t));
         }
     }
+
+    for(i = 0; i < NUM_SKILL_MODES; ++i)
+    {
+        R_CachePatch(&skillModeNames[i], skillModePatchNames[i]);
+    }
+
     DD_SetInteger(DD_UPSCALE_AND_SHARPEN_PATCHES, false);
 
-    // load the map name patches
+    R_CachePatch(&m_pause, "M_PAUSE");
+
+    // Load the map name patches.
 # if __JDOOM64__
     {
         int NUMCMAPS = 32;
@@ -215,6 +251,10 @@
                 R_CachePatch(&levelNamePatches[(j* 9)+i], name);
             }
         }
+
+        episodeNamePatches = Z_Malloc(sizeof(dpatch_t) * 4, PU_STATIC, 0);
+        for(i = 0; i < 4; ++i)
+            R_CachePatch(&episodeNamePatches[i], episodePatchNames[i]);
     }
 # endif
 #elif __JSTRIFE__
@@ -1252,19 +1292,22 @@
  *                      (ie it does not originate from a DED definition).
  */
 void WI_DrawPatch(int x, int y, float r, float g, float b, float a,
-                  int lump, char *altstring, boolean builtin, int halign)
+                  dpatch_t* patch, char *altstring, boolean builtin,
+                  int halign)
 {
-    char    def[80], *string;
-    int patchString = 0;
-    int posx = x;
-    lumppatch_t *patch;
+    char                def[80], *string;
+    int                 patchString = 0;
+    int                 posx = x;
 
     if(IS_DEDICATED)
         return;
 
+    if(!patch)
+        return;
+
     if(altstring && !builtin)
     {   // We have already determined a string to replace this with.
-        if(W_IsFromIWAD(lump))
+        if(W_IsFromIWAD(patch->lump))
         {
             WI_DrawParamText(x, y, altstring, huFontB, r, g, b, a, false,
                              true, halign);
@@ -1273,15 +1316,15 @@
     }
     else if(cfg.usePatchReplacement)
     {   // We might be able to replace the patch with a string
-        if(lump <= 0)
+        if(!patch)
             return;
 
         strcpy(def, "Patch Replacement|");
-        strcat(def, W_LumpName(lump));
+        strcat(def, W_LumpName(patch->lump));
 
         patchString = Def_Get(DD_DEF_VALUE, def, &string);
 
-        if(W_IsFromIWAD(lump))
+        if(W_IsFromIWAD(patch->lump))
         {
             // A user replacement?
             if(patchString)
@@ -1301,19 +1344,17 @@
         }
     }
 
-    if(lump <= 0)
+    if(!patch)
         return;
 
-    patch = (lumppatch_t *) W_CacheLumpNum(lump, PU_CACHE);
-
     // No replacement possible/wanted - use the original patch.
     if(halign == ALIGN_CENTER)
-        posx -= SHORT(patch->width) /2;
+        posx -= patch->width /2;
     else if(halign == ALIGN_RIGHT)
-        posx -= SHORT(patch->width);
+        posx -= patch->width;
 
     DGL_Color4f(1, 1, 1, a);
-    GL_DrawPatch_CS(posx, y, lump);
+    GL_DrawPatch_CS(posx, y, patch->lump);
 }
 
 /**

Modified: trunk/doomsday/plugins/common/src/r_common.c
===================================================================
--- trunk/doomsday/plugins/common/src/r_common.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/common/src/r_common.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -229,9 +229,9 @@
 #undef FIXYTOSCREENY
 }
 
-void R_CachePatch(dpatch_t *dp, char *name)
+void R_CachePatch(dpatch_t* dp, const char* name)
 {
-    lumppatch_t        *patch;
+    lumppatch_t*        patch;
 
     if(IS_DEDICATED)
         return;

Modified: trunk/doomsday/plugins/common/src/st_lib.c
===================================================================
--- trunk/doomsday/plugins/common/src/st_lib.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/common/src/st_lib.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -65,7 +65,7 @@
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-int sttminus_i;
+dpatch_t huMinus;
 
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
@@ -73,7 +73,7 @@
 
 void STlib_init(void)
 {
-    sttminus_i = W_GetNumForName(MINUSPATCH);
+    R_CachePatch(&huMinus, MINUSPATCH);
 }
 
 void STlib_initNum(st_number_t* n, int x, int y, dpatch_t* pl, int* num,
@@ -120,21 +120,21 @@
 
     // In the special case of 0, you draw 0.
     if(!num)
-        WI_DrawPatch(x - w, n->y, 1, 1, 1, *n->alpha, n->p[0].lump,
+        WI_DrawPatch(x - w, n->y, 1, 1, 1, *n->alpha, &n->p[0],
                      NULL, false, ALIGN_LEFT);
 
     // Draw the number.
     while(num && numdigits--)
     {
         x -= w;
-        WI_DrawPatch(x, n->y, 1, 1, 1, *n->alpha, n->p[num % 10].lump,
+        WI_DrawPatch(x, n->y, 1, 1, 1, *n->alpha, &n->p[num % 10],
                      NULL, false, ALIGN_LEFT);
         num /= 10;
     }
 
     // Draw a minus sign if necessary.
     if(neg)
-        WI_DrawPatch(x - 8, n->y, 1, 1, 1, *n->alpha, sttminus_i,
+        WI_DrawPatch(x - 8, n->y, 1, 1, 1, *n->alpha, &huMinus,
                      NULL, false, ALIGN_LEFT);
 }
 
@@ -154,7 +154,7 @@
 void STlib_updatePercent(st_percent_t* per, int refresh)
 {
     if(refresh && *per->n.on)
-        WI_DrawPatch(per->n.x, per->n.y, 1, 1, 1, *per->n.alpha, per->p->lump,
+        WI_DrawPatch(per->n.x, per->n.y, 1, 1, 1, *per->n.alpha, per->p,
                      NULL, false, ALIGN_LEFT);
 
     STlib_updateNum(&per->n, refresh);
@@ -178,7 +178,7 @@
        *mi->iconNum != -1)
     {
         WI_DrawPatch(mi->x, mi->y, 1, 1, 1, *mi->alpha,
-                     mi->p[*mi->iconNum].lump, NULL, false, ALIGN_LEFT);
+                     &mi->p[*mi->iconNum], NULL, false, ALIGN_LEFT);
         mi->oldIconNum = *mi->iconNum;
     }
 }
@@ -200,8 +200,7 @@
 {
     if(*bi->on && (bi->oldval != *bi->val || refresh))
     {
-
-        WI_DrawPatch(bi->x, bi->y, 1, 1, 1, *bi->alpha, bi->p->lump,
+        WI_DrawPatch(bi->x, bi->y, 1, 1, 1, *bi->alpha, bi->p,
                      NULL, false, ALIGN_LEFT);
         bi->oldval = *bi->val;
     }

Modified: trunk/doomsday/plugins/jdoom/include/mn_def.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/mn_def.h	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jdoom/include/mn_def.h	2008-06-25 20:55:27 UTC (rev 5742)
@@ -106,11 +106,11 @@
 typedef struct {
     menuitemtype_t  type;
     int             flags;
-    char            *text;
-    void            (*func) (int option, void *data);
+    char*           text;
+    void          (*func) (int option, void *data);
     int             option;
-    char           *lumpname;
-    void           *data;
+    dpatch_t*       patch;
+    void*           data;
 } menuitem_t;
 
 // Menu flags

Modified: trunk/doomsday/plugins/jdoom/src/d_refresh.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/d_refresh.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jdoom/src/d_refresh.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -185,7 +185,7 @@
     if(lname)
     {
         WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, alpha,
-                     levelNamePatches[mapnum].lump, lname, false,
+                     &levelNamePatches[mapnum], lname, false,
                      ALIGN_CENTER);
         y += 14;
     }
@@ -377,8 +377,8 @@
     // Draw pause pic (but not if InFine active).
     if(paused && !fiActive)
     {
-        WI_DrawPatch(SCREENWIDTH /2, 4, 1, 1, 1, 1, W_GetNumForName("M_PAUSE"),
-                     NULL, false, ALIGN_CENTER);
+        WI_DrawPatch(SCREENWIDTH /2, 4, 1, 1, 1, 1, &m_pause, NULL, false,
+                     ALIGN_CENTER);
     }
 
     // InFine is drawn whenever active.

Modified: trunk/doomsday/plugins/jdoom/src/wi_stuff.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/wi_stuff.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jdoom/src/wi_stuff.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -347,13 +347,13 @@
 
     // Draw <MapName>
     WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1,
-                 levelNamePatches[mapNum].lump, mapName, false, ALIGN_CENTER);
+                 &levelNamePatches[mapNum], mapName, false, ALIGN_CENTER);
 
     // Draw "Finished!"
     y += (5 * levelNamePatches[mapNum].height) / 4;
 
     WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1,
-                 finished.lump, NULL, false, ALIGN_CENTER);
+                 &finished, NULL, false, ALIGN_CENTER);
 }
 
 /**
@@ -388,14 +388,14 @@
     }
 
     // Draw "Entering"
-    WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1, entering.lump,
+    WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1, &entering,
                  NULL, false, ALIGN_CENTER);
 
     // Draw level.
     y += (5 * levelNamePatches[wbs->next].height) / 4;
 
     WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1,
-                 levelNamePatches[((gameEpisode -1) * 9) + wbs->next].lump,
+                 &levelNamePatches[((gameEpisode -1) * 9) + wbs->next],
                  mapName, false, ALIGN_CENTER);
 }
 
@@ -423,7 +423,7 @@
     {
         WI_DrawPatch(mapPoints[wbs->epsd][n].x, mapPoints[wbs->epsd][n].y,
                      1, 1, 1, 1,
-                     c[i].lump, NULL, false, ALIGN_LEFT);
+                     &c[i], NULL, false, ALIGN_LEFT);
     }
     else
     {
@@ -521,7 +521,7 @@
     {
         a = &anims[wbs->epsd][i];
         if(a->ctr >= 0)
-            WI_DrawPatch(a->loc.x, a->loc.y, 1, 1, 1, 1, a->p[a->ctr].lump,
+            WI_DrawPatch(a->loc.x, a->loc.y, 1, 1, 1, 1, &a->p[a->ctr],
                          NULL, false, ALIGN_LEFT);
     }
 }
@@ -569,13 +569,13 @@
     while(digits--)
     {
         x -= fontwidth;
-        WI_DrawPatch(x, y, 1, 1, 1, 1, num[n % 10].lump, NULL, false, ALIGN_LEFT);
+        WI_DrawPatch(x, y, 1, 1, 1, 1, &num[n % 10], NULL, false, ALIGN_LEFT);
         n /= 10;
     }
 
     // Draw a minus sign if necessary.
     if(neg)
-        WI_DrawPatch(x -= 8, y, 1, 1, 1, 1, wiminus.lump, NULL, false, ALIGN_LEFT);
+        WI_DrawPatch(x -= 8, y, 1, 1, 1, 1, &wiminus, NULL, false, ALIGN_LEFT);
 
     return x;
 }
@@ -585,7 +585,7 @@
     if(p < 0)
         return;
 
-    WI_DrawPatch(x, y, 1, 1, 1, 1, percent.lump, NULL, false, ALIGN_LEFT);
+    WI_DrawPatch(x, y, 1, 1, 1, 1, &percent, NULL, false, ALIGN_LEFT);
     WI_drawNum(x, y, p, -1);
 }
 
@@ -609,7 +609,7 @@
             div *= 60;
 
             if(div == 60 || t / div)
-                WI_DrawPatch(x, y, 1, 1, 1, 1, colon.lump, NULL, false,
+                WI_DrawPatch(x, y, 1, 1, 1, 1, &colon, NULL, false,
                              ALIGN_LEFT);
 
         } while(t / div);
@@ -617,7 +617,7 @@
     else
     {
         // "sucks"
-        WI_DrawPatch(x - sucks.width, y, 1, 1, 1, 1, sucks.lump,
+        WI_DrawPatch(x - sucks.width, y, 1, 1, 1, 1, &sucks,
                      NULL, false, ALIGN_LEFT);
     }
 }
@@ -841,12 +841,12 @@
 
     // Draw stat titles (top line).
     WI_DrawPatch(DM_TOTALSX - total.width / 2,
-                 DM_MATRIXY - WI_SPACINGY + 10, 1, 1, 1, 1, total.lump, NULL,
+                 DM_MATRIXY - WI_SPACINGY + 10, 1, 1, 1, 1, &total, NULL,
                  false, ALIGN_LEFT);
 
-    WI_DrawPatch(DM_KILLERSX, DM_KILLERSY, 1, 1, 1, 1, killers.lump, NULL,
+    WI_DrawPatch(DM_KILLERSX, DM_KILLERSY, 1, 1, 1, 1, &killers, NULL,
                  false, ALIGN_LEFT);
-    WI_DrawPatch(DM_VICTIMSX, DM_VICTIMSY, 1, 1, 1, 1, victims.lump, NULL,
+    WI_DrawPatch(DM_VICTIMSX, DM_VICTIMSY, 1, 1, 1, 1, &victims, NULL,
                  false, ALIGN_LEFT);
 
     x = DM_MATRIXX + DM_SPACINGX;
@@ -857,19 +857,19 @@
         if(teamInfo[i].members)
         {
             WI_DrawPatch(x - p[i].width / 2, DM_MATRIXY - WI_SPACINGY,
-                         1, 1, 1, 1, p[i].lump, NULL, false, ALIGN_LEFT);
+                         1, 1, 1, 1, &p[i], NULL, false, ALIGN_LEFT);
 
             WI_DrawPatch(DM_MATRIXX - p[i].width / 2, y, 1, 1, 1, 1,
-                         p[i].lump, NULL, false, ALIGN_LEFT);
+                         &p[i], NULL, false, ALIGN_LEFT);
 
             if(i == myTeam)
             {
                 WI_DrawPatch(x - p[i].width / 2,
-                             DM_MATRIXY - WI_SPACINGY, 1, 1, 1, 1, bstar.lump,
+                             DM_MATRIXY - WI_SPACINGY, 1, 1, 1, 1, &bstar,
                              NULL, false, ALIGN_LEFT);
 
                 WI_DrawPatch(DM_MATRIXX - p[i].width / 2, y, 1, 1, 1, 1,
-                             star.lump, NULL, false, ALIGN_LEFT);
+                             &star, NULL, false, ALIGN_LEFT);
             }
 
             // If more than 1 member, show the member count.
@@ -888,10 +888,10 @@
         else
         {
             WI_DrawPatch(x - bp[i].width / 2, DM_MATRIXY - WI_SPACINGY, 1, 1, 1, 1,
-                         bp[i].lump, NULL, false, ALIGN_LEFT);
+                         &bp[i], NULL, false, ALIGN_LEFT);
 
             WI_DrawPatch(DM_MATRIXX - bp[i].width / 2, y, 1, 1, 1, 1,
-                         bp[i].lump, NULL, false, ALIGN_LEFT);
+                         &bp[i], NULL, false, ALIGN_LEFT);
         }
 
         x += DM_SPACINGX;
@@ -1094,17 +1094,17 @@
 
     // Draw stat titles (top line).
     WI_DrawPatch(NG_STATSX + NG_SPACINGX - kills.width, NG_STATSY,
-                 1, 1, 1, 1, kills.lump, NULL, false, ALIGN_LEFT);
+                 1, 1, 1, 1, &kills, NULL, false, ALIGN_LEFT);
 
     WI_DrawPatch(NG_STATSX + 2 * NG_SPACINGX - items.width, NG_STATSY,
-                 1, 1, 1, 1, items.lump, NULL, false, ALIGN_LEFT);
+                 1, 1, 1, 1, &items, NULL, false, ALIGN_LEFT);
 
     WI_DrawPatch(NG_STATSX + 3 * NG_SPACINGX - secret.width, NG_STATSY,
-                 1, 1, 1, 1, secret.lump, NULL, false, ALIGN_LEFT);
+                 1, 1, 1, 1, &secret, NULL, false, ALIGN_LEFT);
 
     if(doFrags)
         WI_DrawPatch(NG_STATSX + 4 * NG_SPACINGX - frags.width,
-                     1, 1, 1, 1, NG_STATSY, frags.lump, NULL, false, ALIGN_LEFT);
+                     1, 1, 1, 1, NG_STATSY, &frags, NULL, false, ALIGN_LEFT);
 
     // Draw stats.
     y = NG_STATSY + kills.height;
@@ -1115,7 +1115,7 @@
             continue;
 
         x = NG_STATSX;
-        WI_DrawPatch(x - p[i].width, y, 1, 1, 1, 1, p[i].lump, NULL,
+        WI_DrawPatch(x - p[i].width, y, 1, 1, 1, 1, &p[i], NULL,
                      false, ALIGN_LEFT);
 
         // If more than 1 member, show the member count.
@@ -1129,7 +1129,7 @@
         }
 
         if(i == myTeam)
-            WI_DrawPatch(x - p[i].width, y, 1, 1, 1, 1, star.lump, NULL,
+            WI_DrawPatch(x - p[i].width, y, 1, 1, 1, 1, &star, NULL,
                          false, ALIGN_LEFT);
 
         x += NG_SPACINGX;
@@ -1281,25 +1281,25 @@
 
     WI_drawLF();
 
-    WI_DrawPatch(SP_STATSX, SP_STATSY, 1, 1, 1, 1, kills.lump, NULL,
+    WI_DrawPatch(SP_STATSX, SP_STATSY, 1, 1, 1, 1, &kills, NULL,
                  false, ALIGN_LEFT);
     WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY, cntKills[0]);
 
-    WI_DrawPatch(SP_STATSX, SP_STATSY + lh, 1, 1, 1, 1, items.lump, NULL,
+    WI_DrawPatch(SP_STATSX, SP_STATSY + lh, 1, 1, 1, 1, &items, NULL,
                  false, ALIGN_LEFT);
     WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY + lh, cntItems[0]);
 
-    WI_DrawPatch(SP_STATSX, SP_STATSY + 2 * lh, 1, 1, 1, 1, sp_secret.lump,
+    WI_DrawPatch(SP_STATSX, SP_STATSY + 2 * lh, 1, 1, 1, 1, &sp_secret,
                  NULL, false, ALIGN_LEFT);
     WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY + 2 * lh, cntSecret[0]);
 
-    WI_DrawPatch(SP_TIMEX, SP_TIMEY, 1, 1, 1, 1, time.lump, NULL, false,
+    WI_DrawPatch(SP_TIMEX, SP_TIMEY, 1, 1, 1, 1, &time, NULL, false,
                  ALIGN_LEFT);
     WI_drawTime(SCREENWIDTH / 2 - SP_TIMEX, SP_TIMEY, cntTime);
 
     if(wbs->epsd < 3 && wbs->parTime != -1)
     {
-        WI_DrawPatch(SCREENWIDTH / 2 + SP_TIMEX, SP_TIMEY, 1, 1, 1, 1, par.lump,
+        WI_DrawPatch(SCREENWIDTH / 2 + SP_TIMEX, SP_TIMEY, 1, 1, 1, 1, &par,
                      NULL, false, ALIGN_LEFT);
         WI_drawTime(SCREENWIDTH - SP_TIMEX, SP_TIMEY, cntPar);
     }

Modified: trunk/doomsday/plugins/jdoom64/include/mn_def.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/mn_def.h	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jdoom64/include/mn_def.h	2008-06-25 20:55:27 UTC (rev 5742)
@@ -105,11 +105,11 @@
 typedef struct {
     menuitemtype_t  type;
     int             flags;
-    char            *text;
-    void            (*func) (int option, void *data);
+    char*           text;
+    void          (*func) (int option, void *data);
     int             option;
-    char           *lumpname;
-    void           *data;
+    dpatch_t*       patch;
+    void*           data;
 } menuitem_t;
 
 // Menu flags

Modified: trunk/doomsday/plugins/jdoom64/src/d_refresh.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/d_refresh.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jdoom64/src/d_refresh.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -186,7 +186,7 @@
 
     if(lname)
     {
-        WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, alpha, levelNamePatches[mapnum].lump,
+        WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, alpha, &levelNamePatches[mapnum],
                      lname, false, ALIGN_CENTER);
         y += 14;                //9;
     }
@@ -315,7 +315,7 @@
         //    ay = viewwindowy + 4;
 
         WI_DrawPatch(SCREENWIDTH /2, ay, 1, 1, 1, 1,
-                     W_GetNumForName("M_PAUSE"), NULL, false, ALIGN_CENTER);
+                     &m_pause, NULL, false, ALIGN_CENTER);
     }
 }
 
@@ -432,7 +432,7 @@
     if(P_IsCamera(mo))
         mo->ddFlags |= DDMF_DONTDRAW;
 
-    if(mo->flags & MF_CORPSE && cfg.corpseTime && mo->corpseTics == -1)
+    if((mo->flags & MF_CORPSE) && cfg.corpseTime && mo->corpseTics == -1)
         mo->ddFlags |= DDMF_DONTDRAW;
 
     // Choose which ddflags to set.

Modified: trunk/doomsday/plugins/jdoom64/src/wi_stuff.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/wi_stuff.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jdoom64/src/wi_stuff.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -185,13 +185,13 @@
 
     // Draw <LevelName>
     WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1,
-                 levelNamePatches[mapnum].lump, lname, false, ALIGN_CENTER);
+                 &levelNamePatches[mapnum], lname, false, ALIGN_CENTER);
 
     // Draw "Finished!"
     y += (5 * levelNamePatches[mapnum].height) / 4;
 
     WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1,
-                 finished.lump, NULL, false, ALIGN_CENTER);
+                 &finished, NULL, false, ALIGN_CENTER);
 }
 
 /**
@@ -221,14 +221,14 @@
     }
 
     // Draw "Entering"
-    WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1, entering.lump,
+    WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1, &entering,
                  NULL, false, ALIGN_CENTER);
 
     // Draw level.
     y += (5 * levelNamePatches[wbs->next].height) / 4;
 
     WI_DrawPatch(SCREENWIDTH / 2, y, 1, 1, 1, 1,
-                 levelNamePatches[((gameEpisode -1) * 9) + wbs->next].lump,
+                 &levelNamePatches[((gameEpisode -1) * 9) + wbs->next],
                  lname, false, ALIGN_CENTER);
 }
 
@@ -291,13 +291,13 @@
     while(digits--)
     {
         x -= fontwidth;
-        WI_DrawPatch(x, y, 1, 1, 1, 1, num[n % 10].lump, NULL, false, ALIGN_LEFT);
+        WI_DrawPatch(x, y, 1, 1, 1, 1, &num[n % 10], NULL, false, ALIGN_LEFT);
         n /= 10;
     }
 
     // Draw a minus sign if necessary.
     if(neg)
-        WI_DrawPatch(x -= 8, y, 1, 1, 1, 1, minus.lump, NULL, false, ALIGN_LEFT);
+        WI_DrawPatch(x -= 8, y, 1, 1, 1, 1, &minus, NULL, false, ALIGN_LEFT);
 
     return x;
 }
@@ -307,7 +307,7 @@
     if(p < 0)
         return;
 
-    WI_DrawPatch(x, y, 1, 1, 1, 1, percent.lump, NULL, false, ALIGN_LEFT);
+    WI_DrawPatch(x, y, 1, 1, 1, 1, &percent, NULL, false, ALIGN_LEFT);
     WI_drawNum(x, y, p, -1);
 }
 
@@ -331,7 +331,7 @@
             div *= 60;
 
             if(div == 60 || t / div)
-                WI_DrawPatch(x, y, 1, 1, 1, 1, colon.lump, NULL, false,
+                WI_DrawPatch(x, y, 1, 1, 1, 1, &colon, NULL, false,
                              ALIGN_LEFT);
 
         } while(t / div);
@@ -339,7 +339,7 @@
     else
     {
         // "sucks"
-        WI_DrawPatch(x - sucks.width, y, 1, 1, 1, 1, sucks.lump,
+        WI_DrawPatch(x - sucks.width, y, 1, 1, 1, 1, &sucks,
                      NULL, false, ALIGN_LEFT);
     }
 }
@@ -500,12 +500,12 @@
 
     // Draw stat titles (top line).
     WI_DrawPatch(DM_TOTALSX - total.width / 2,
-                 DM_MATRIXY - WI_SPACINGY + 10, 1, 1, 1, 1, total.lump, NULL,
+                 DM_MATRIXY - WI_SPACINGY + 10, 1, 1, 1, 1, &total, NULL,
                  false, ALIGN_LEFT);
 
-    WI_DrawPatch(DM_KILLERSX, DM_KILLERSY, 1, 1, 1, 1, killers.lump, NULL,
+    WI_DrawPatch(DM_KILLERSX, DM_KILLERSY, 1, 1, 1, 1, &killers, NULL,
                  false, ALIGN_LEFT);
-    WI_DrawPatch(DM_VICTIMSX, DM_VICTIMSY, 1, 1, 1, 1, victims.lump, NULL,
+    WI_DrawPatch(DM_VICTIMSX, DM_VICTIMSY, 1, 1, 1, 1, &victims, NULL,
                  false, ALIGN_LEFT);
 
     // Draw P?
@@ -517,19 +517,19 @@
         if(teamInfo[i].members)
         {
             WI_DrawPatch(x - p[i].width / 2, DM_MATRIXY - WI_SPACINGY,
-                         1, 1, 1, 1, p[i].lump, NULL, false, ALIGN_LEFT);
+                         1, 1, 1, 1, &p[i], NULL, false, ALIGN_LEFT);
 
             WI_DrawPatch(DM_MATRIXX - p[i].width / 2, y, 1, 1, 1, 1,
-                         p[i].lump, NULL, false, ALIGN_LEFT);
+                         &p[i], NULL, false, ALIGN_LEFT);
 
             if(i == myTeam)
             {
                 WI_DrawPatch(x - p[i].width / 2,
-                             DM_MATRIXY - WI_SPACINGY, 1, 1, 1, 1, bstar.lump,
+                             DM_MATRIXY - WI_SPACINGY, 1, 1, 1, 1, &bstar,
                              NULL, false, ALIGN_LEFT);
 
                 WI_DrawPatch(DM_MATRIXX - p[i].width / 2, y, 1, 1, 1, 1,
-                             star.lump, NULL, false, ALIGN_LEFT);
+                             &star, NULL, false, ALIGN_LEFT);
             }
 
             // If more than 1 member, show the member count.
@@ -548,10 +548,10 @@
         else
         {
             WI_DrawPatch(x - bp[i].width / 2, DM_MATRIXY - WI_SPACINGY, 1, 1, 1, 1,
-                         bp[i].lump, NULL, false, ALIGN_LEFT);
+                         &bp[i], NULL, false, ALIGN_LEFT);
 
             WI_DrawPatch(DM_MATRIXX - bp[i].width / 2, y, 1, 1, 1, 1,
-                         bp[i].lump, NULL, false, ALIGN_LEFT);
+                         &bp[i], NULL, false, ALIGN_LEFT);
         }
 
         x += DM_SPACINGX;
@@ -752,17 +752,17 @@
 
     // Draw stat titles (top line).
     WI_DrawPatch(NG_STATSX + NG_SPACINGX - kills.width, NG_STATSY,
-                 1, 1, 1, 1, kills.lump, NULL, false, ALIGN_LEFT);
+                 1, 1, 1, 1, &kills, NULL, false, ALIGN_LEFT);
 
     WI_DrawPatch(NG_STATSX + 2 * NG_SPACINGX - items.width, NG_STATSY,
-                 1, 1, 1, 1, items.lump, NULL, false, ALIGN_LEFT);
+                 1, 1, 1, 1, &items, NULL, false, ALIGN_LEFT);
 
     WI_DrawPatch(NG_STATSX + 3 * NG_SPACINGX - secret.width, NG_STATSY,
-                 1, 1, 1, 1, secret.lump, NULL, false, ALIGN_LEFT);
+                 1, 1, 1, 1, &secret, NULL, false, ALIGN_LEFT);
 
     if(doFrags)
         WI_DrawPatch(NG_STATSX + 4 * NG_SPACINGX - frags.width,
-                     1, 1, 1, 1, NG_STATSY, frags.lump, NULL, false, ALIGN_LEFT);
+                     1, 1, 1, 1, NG_STATSY, &frags, NULL, false, ALIGN_LEFT);
 
     // Draw stats.
     y = NG_STATSY + kills.height;
@@ -773,7 +773,7 @@
             continue;
 
         x = NG_STATSX;
-        WI_DrawPatch(x - p[i].width, y, 1, 1, 1, 1, p[i].lump, NULL,
+        WI_DrawPatch(x - p[i].width, y, 1, 1, 1, 1, &p[i], NULL,
                      false, ALIGN_LEFT);
         // If more than 1 member, show the member count.
         if(teamInfo[i].members > 1)
@@ -786,7 +786,7 @@
         }
 
         if(i == myTeam)
-            WI_DrawPatch(x - p[i].width, y, 1, 1, 1, 1, star.lump, NULL,
+            WI_DrawPatch(x - p[i].width, y, 1, 1, 1, 1, &star, NULL,
                          false, ALIGN_LEFT);
 
         x += NG_SPACINGX;
@@ -933,25 +933,25 @@
 
     WI_drawLF();
 
-    WI_DrawPatch(SP_STATSX, SP_STATSY, 1, 1, 1, 1, kills.lump, NULL,
+    WI_DrawPatch(SP_STATSX, SP_STATSY, 1, 1, 1, 1, &kills, NULL,
                  false, ALIGN_LEFT);
     WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY, cntKills[0]);
 
-    WI_DrawPatch(SP_STATSX, SP_STATSY + lh, 1, 1, 1, 1, items.lump, NULL,
+    WI_DrawPatch(SP_STATSX, SP_STATSY + lh, 1, 1, 1, 1, &items, NULL,
                  false, ALIGN_LEFT);
     WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY + lh, cntItems[0]);
 
-    WI_DrawPatch(SP_STATSX, SP_STATSY + 2 * lh, 1, 1, 1, 1, sp_secret.lump,
+    WI_DrawPatch(SP_STATSX, SP_STATSY + 2 * lh, 1, 1, 1, 1, &sp_secret,
                  NULL, false, ALIGN_LEFT);
     WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY + 2 * lh, cntSecret[0]);
 
-    WI_DrawPatch(SP_TIMEX, SP_TIMEY, 1, 1, 1, 1, time.lump, NULL, false,
+    WI_DrawPatch(SP_TIMEX, SP_TIMEY, 1, 1, 1, 1, &time, NULL, false,
                  ALIGN_LEFT);
     WI_drawTime(SCREENWIDTH / 2 - SP_TIMEX, SP_TIMEY, cntTime);
 
     if(wbs->parTime != -1)
     {
-        WI_DrawPatch(SCREENWIDTH / 2 + SP_TIMEX, SP_TIMEY, 1, 1, 1, 1, par.lump,
+        WI_DrawPatch(SCREENWIDTH / 2 + SP_TIMEX, SP_TIMEY, 1, 1, 1, 1, &par,
                      NULL, false, ALIGN_LEFT);
         WI_drawTime(SCREENWIDTH - SP_TIMEX, SP_TIMEY, cntPar);
     }

Modified: trunk/doomsday/plugins/jheretic/include/mn_def.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/mn_def.h	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jheretic/include/mn_def.h	2008-06-25 20:55:27 UTC (rev 5742)
@@ -106,11 +106,11 @@
 typedef struct {
     menuitemtype_t  type;
     int             flags;
-    char            *text;
-    void            (*func) (int option, void *data);
+    char*           text;
+    void          (*func) (int option, void *data);
     int             option;
-    char           *lumpname;
-    void           *data;
+    dpatch_t*       patch;
+    void*           data;
 } menuitem_t;
 
 // Menu flags

Modified: trunk/doomsday/plugins/jhexen/include/mn_def.h
===================================================================
--- trunk/doomsday/plugins/jhexen/include/mn_def.h	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jhexen/include/mn_def.h	2008-06-25 20:55:27 UTC (rev 5742)
@@ -4,7 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2004-2008 Jaakko Keränen <jaakko.keranen@...>
- *\author Copyright © 2005-2007 Daniel Swanson <danij@...>
+ *\author Copyright © 2005-2008 Daniel Swanson <danij@...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -115,11 +115,11 @@
 typedef struct {
     menuitemtype_t  type;
     int             flags;
-    char            *text;
-    void            (*func) (int option, void *data);
+    char*           text;
+    void          (*func) (int option, void *data);
     int             option;
-    char           *lumpname;
-    void           *data;
+    dpatch_t*       patch;
+    void*           data;
 } menuitem_t;
 
 // Menu flags

Modified: trunk/doomsday/plugins/jhexen/src/hrefresh.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/hrefresh.c	2008-06-25 20:44:58 UTC (rev 5741)
+++ trunk/doomsday/plugins/jhexen/src/hrefresh.c	2008-06-25 20:55:27 UTC (rev 5742)
@@ -235,8 +235,8 @@
             if(P_ToXSectorOfSubsector(vplayer->plr->mo->subsector)->special == 200)
             {
                 special200 = true;
-                Rend_SkyParams(0, DD_DISABLE, 0);
-                Rend_SkyParams(1, DD_ENABLE, 0);
+                Rend_SkyParams(0, DD_DISABLE, NULL);
+                Rend_SkyParams(1, DD_ENABLE, NULL);
             }
 
             // How about a bit of quake?
@@ -258,8 +258,8 @@
 
             if(special200)
             {
-                Rend_SkyParams(0, DD_ENABLE, 0);
-                Rend_SkyParams(1, DD_DISABLE, 0);
+                Rend_SkyParams(0, DD_ENABLE, NULL);
+                Rend_SkyParams(1, DD_DISABLE, NULL);
             }
 
             if(!iscam)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5745
          http://deng.svn.sourceforge.net/deng/?rev=5745&view=rev
Author:   danij
Date:     2008-06-25 14:15:42 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
All Games: Moved the typedef dirtype_t into p_mobj.h

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/include/p_mobj.h
    trunk/doomsday/plugins/jheretic/include/p_mobj.h
    trunk/doomsday/plugins/jhexen/include/p_mobj.h
    trunk/doomsday/plugins/wolftc/include/p_mobj.h

Modified: trunk/doomsday/plugins/jdoom/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/p_mobj.h	2008-06-25 21:13:52 UTC (rev 5744)
+++ trunk/doomsday/plugins/jdoom/include/p_mobj.h	2008-06-25 21:15:42 UTC (rev 5745)
@@ -165,6 +165,19 @@
 #define OVERDRIVE           6
 #define MAXGEAR             (OVERDRIVE+16)
 
+typedef enum dirtype_s {
+    DI_EAST,
+    DI_NORTHEAST,
+    DI_NORTH,
+    DI_NORTHWEST,
+    DI_WEST,
+    DI_SOUTHWEST,
+    DI_SOUTH,
+    DI_SOUTHEAST,
+    DI_NODIR,
+    NUMDIRS
+} dirtype_t;
+
 // Map Object definition.
 typedef struct mobj_s {
     // Defined in dd_share.h; required mobj elements.

Modified: trunk/doomsday/plugins/jheretic/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/p_mobj.h	2008-06-25 21:13:52 UTC (rev 5744)
+++ trunk/doomsday/plugins/jheretic/include/p_mobj.h	2008-06-25 21:15:42 UTC (rev 5745)
@@ -167,6 +167,19 @@
 #define OVERDRIVE 6
 #define MAXGEAR (OVERDRIVE+16)
 
+typedef enum dirtype_s {
+    DI_EAST,
+    DI_NORTHEAST,
+    DI_NORTH,
+    DI_NORTHWEST,
+    DI_WEST,
+    DI_SOUTHWEST,
+    DI_SOUTH,
+    DI_SOUTHEAST,
+    DI_NODIR,
+    NUMDIRS
+} dirtype_t;
+
 // Map Object definition.
 typedef struct mobj_s {
     // Defined in dd_share.h; required mobj elements.

Modified: trunk/doomsday/plugins/jhexen/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/jhexen/include/p_mobj.h	2008-06-25 21:13:52 UTC (rev 5744)
+++ trunk/doomsday/plugins/jhexen/include/p_mobj.h	2008-06-25 21:15:42 UTC (rev 5745)
@@ -183,6 +183,19 @@
 
 #define MF3_NOINFIGHT       0x00000001  // Mobj will never be targeted for in-fighting
 
+typedef enum dirtype_s {
+    DI_EAST,
+    DI_NORTHEAST,
+    DI_NORTH,
+    DI_NORTHWEST,
+    DI_WEST,
+    DI_SOUTHWEST,
+    DI_SOUTH,
+    DI_SOUTHEAST,
+    DI_NODIR,
+    NUMDIRS
+} dirtype_t;
+
 typedef struct mobj_s {
     // Defined in dd_share.h; required mobj elements.
     DD_BASE_MOBJ_ELEMENTS()

Modified: trunk/doomsday/plugins/wolftc/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/wolftc/include/p_mobj.h	2008-06-25 21:13:52 UTC (rev 5744)
+++ trunk/doomsday/plugins/wolftc/include/p_mobj.h	2008-06-25 21:15:42 UTC (rev 5745)
@@ -179,12 +179,23 @@
  * end mobj flags
  */
 
-
-// killough $dropoff_fix
 // For torque simulation:
-#define OVERDRIVE 6
-#define MAXGEAR (OVERDRIVE+16)
+#define OVERDRIVE           6
+#define MAXGEAR             (OVERDRIVE+16)
 
+typedef enum dirtype_s {
+    DI_EAST,
+    DI_NORTHEAST,
+    DI_NORTH,
+    DI_NORTHWEST,
+    DI_WEST,
+    DI_SOUTHWEST,
+    DI_SOUTH,
+    DI_SOUTHEAST,
+    DI_NODIR,
+    NUMDIRS
+} dirtype_t;
+
 // Map Object definition.
 typedef struct mobj_s {
     // Defined in dd_share.h; required mobj elements.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5746
          http://deng.svn.sourceforge.net/deng/?rev=5746&view=rev
Author:   danij
Date:     2008-06-25 14:38:06 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
jDoom: Fixed problem of the Archvile attack not throwing players into the air as far as it used to. Also moved the typedef dirtype_t into p_mobj.h

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/src/p_enemy.c
    trunk/doomsday/plugins/jheretic/src/p_enemy.c
    trunk/doomsday/plugins/jhexen/src/p_enemy.c
    trunk/doomsday/plugins/wolftc/src/p_enemy.c

Modified: trunk/doomsday/plugins/jdoom/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_enemy.c	2008-06-25 21:15:42 UTC (rev 5745)
+++ trunk/doomsday/plugins/jdoom/src/p_enemy.c	2008-06-25 21:38:06 UTC (rev 5746)
@@ -55,19 +55,6 @@
 
 // TYPES -------------------------------------------------------------------
 
-typedef enum dirtype_s {
-    DI_EAST,
-    DI_NORTHEAST,
-    DI_NORTH,
-    DI_NORTHWEST,
-    DI_WEST,
-    DI_SOUTHWEST,
-    DI_SOUTH,
-    DI_SOUTHEAST,
-    DI_NODIR,
-    NUMDIRS
-} dirtype_t;
-
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@@ -217,7 +204,7 @@
     if(actor->moveDir == DI_NODIR)
         return false;
 
-    if((unsigned) actor->moveDir >= 8)
+    if((unsigned) actor->moveDir >= DI_NODIR)
         Con_Error("Weird actor->moveDir!");
 
     step[VX] = actor->info->speed * dirSpeed[actor->moveDir][MX];
@@ -740,7 +727,7 @@
     }
 
     // Turn towards movement direction if not there yet.
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
         delta = actor->angle - (actor->moveDir << 29);
@@ -1316,9 +1303,9 @@
     A_Fire(fog);
 }
 
-void C_DECL A_VileAttack(mobj_t *actor)
+void C_DECL A_VileAttack(mobj_t* actor)
 {
-    mobj_t             *fire;
+    mobj_t*             fire;
     uint                an;
 
     if(!actor->target)
@@ -1331,7 +1318,8 @@
 
     S_StartSound(SFX_BAREXP, actor);
     P_DamageMobj(actor->target, actor, actor, 20);
-    actor->target->mom[MZ] = 1000 / actor->target->info->mass;
+    actor->target->mom[MZ] =
+        FIX2FLT(1000 * FRACUNIT / actor->target->info->mass);
 
     an = actor->angle >> ANGLETOFINESHIFT;
     fire = actor->tracer;
@@ -1339,9 +1327,9 @@
     if(!fire)
         return;
 
-    // Move the fire between the vile and the player.
-    fire->pos[VX] = actor->target->pos[VX] - (24 * FIX2FLT(finecosine[an]));
-    fire->pos[VY] = actor->target->pos[VY] - (24 * FIX2FLT(finesine[an]));
+    // Move the fire between the Vile and the player.
+    fire->pos[VX] = actor->target->pos[VX] - 24 * FIX2FLT(finecosine[an]);
+    fire->pos[VY] = actor->target->pos[VY] - 24 * FIX2FLT(finesine[an]);
     P_RadiusAttack(fire, actor, 70, 69);
 }
 

Modified: trunk/doomsday/plugins/jheretic/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_enemy.c	2008-06-25 21:15:42 UTC (rev 5745)
+++ trunk/doomsday/plugins/jheretic/src/p_enemy.c	2008-06-25 21:38:06 UTC (rev 5746)
@@ -75,19 +75,6 @@
 
 // TYPES -------------------------------------------------------------------
 
-typedef enum {
-    DI_EAST,
-    DI_NORTHEAST,
-    DI_NORTH,
-    DI_NORTHWEST,
-    DI_WEST,
-    DI_SOUTHWEST,
-    DI_SOUTH,
-    DI_SOUTHEAST,
-    DI_NODIR,
-    NUMDIRS
-} dirtype_t;
-
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 
 boolean P_TestMobjLocation(mobj_t *mobj);
@@ -218,7 +205,7 @@
     if(actor->moveDir == DI_NODIR)
         return false;
 
-    if((unsigned) actor->moveDir >= 8)
+    if((unsigned) actor->moveDir >= DI_NODIR)
         Con_Error("Weird actor->moveDir!");
 
     step[VX] = actor->info->speed * dirSpeed[actor->moveDir][VX];
@@ -706,7 +693,7 @@
     }
 
     // Turn towards movement direction if not there yet.
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
 

Modified: trunk/doomsday/plugins/jhexen/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_enemy.c	2008-06-25 21:15:42 UTC (rev 5745)
+++ trunk/doomsday/plugins/jhexen/src/p_enemy.c	2008-06-25 21:38:06 UTC (rev 5746)
@@ -111,19 +111,6 @@
 
 // TYPES -------------------------------------------------------------------
 
-typedef enum {
-    DI_EAST,
-    DI_NORTHEAST,
-    DI_NORTH,
-    DI_NORTHWEST,
-    DI_WEST,
-    DI_SOUTHWEST,
-    DI_SOUTH,
-    DI_SOUTHEAST,
-    DI_NODIR,
-    NUMDIRS
-} dirtype_t;
-
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@@ -658,7 +645,7 @@
     }
 
     // Turn towards movement direction if not there yet.
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
         delta = actor->angle - (actor->moveDir << 29);
@@ -1824,7 +1811,7 @@
     }
 
     // Turn towards movement direction if not there yet.
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
         delta = actor->angle - (actor->moveDir << 29);
@@ -1993,7 +1980,7 @@
     }
 
     // Turn towards movement direction if not there yet.
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
         delta = actor->angle - (actor->moveDir << 29);
@@ -4019,7 +4006,7 @@
     }
 
     // Turn towards movement direction if not there yet.
-    if(mo->moveDir < 8)
+    if(mo->moveDir < DI_NODIR)
     {
         mo->angle &= (7 << 29);
         delta = mo->angle - (mo->moveDir << 29);

Modified: trunk/doomsday/plugins/wolftc/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_enemy.c	2008-06-25 21:15:42 UTC (rev 5745)
+++ trunk/doomsday/plugins/wolftc/src/p_enemy.c	2008-06-25 21:38:06 UTC (rev 5746)
@@ -58,19 +58,6 @@
 
 // TYPES -------------------------------------------------------------------
 
-typedef enum {
-    DI_EAST,
-    DI_NORTHEAST,
-    DI_NORTH,
-    DI_NORTHWEST,
-    DI_WEST,
-    DI_SOUTHWEST,
-    DI_SOUTH,
-    DI_SOUTHEAST,
-    DI_NODIR,
-    NUMDIRS
-} dirtype_t;
-
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@@ -228,7 +215,7 @@
     if(actor->moveDir == DI_NODIR)
         return false;
 
-    if((unsigned) actor->moveDir >= 8)
+    if((unsigned) actor->moveDir >= DI_NODIR)
         Con_Error("Weird actor->moveDir!");
 
     stepx = actor->info->speed / FRACUNIT * xspeed[actor->moveDir];
@@ -678,7 +665,7 @@
     }
 
     // turn towards movement direction if not there yet
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
         delta = actor->angle - (actor->moveDir << 29);
@@ -1245,10 +1232,10 @@
     A_Fire(fog);
 }
 
-void C_DECL A_VileAttack(mobj_t *actor)
+void C_DECL A_VileAttack(mobj_t* actor)
 {
-    mobj_t *fire;
-    int     an;
+    mobj_t*             fire;
+    uint                an;
 
     if(!actor->target)
         return;
@@ -1260,18 +1247,18 @@
 
     S_StartSound(SFX_BAREXP, actor);
     P_DamageMobj(actor->target, actor, actor, 20);
-    actor->target->mom[MZ] = 1000 * FRACUNIT / actor->target->info->mass;
+    actor->target->mom[MZ] =
+        FIX2FLT(1000 * FRACUNIT / actor->target->info->mass);
 
     an = actor->angle >> ANGLETOFINESHIFT;
-
     fire = actor->tracer;
 
     if(!fire)
         return;
 
-    // move the fire between the vile and the player
-    fire->pos[VX] = actor->target->pos[VX] - FixedMul(24 * FRACUNIT, finecosine[an]);
-    fire->pos[VY] = actor->target->pos[VY] - FixedMul(24 * FRACUNIT, finesine[an]);
+    // Move the fire between the Vile and the player.
+    fire->pos[VX] = actor->target->pos[VX] - 24 * FIX2FLT(finecosine[an]);
+    fire->pos[VY] = actor->target->pos[VY] - 24 * FIX2FLT(finesine[an]);
     P_RadiusAttack(fire, actor, 70, 69);
 }
 
@@ -3483,7 +3470,7 @@
     }
 
     // turn towards movement direction if not there yet
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
         delta = actor->angle - (actor->moveDir << 29);
@@ -3575,7 +3562,7 @@
     }
 
     // turn towards movement direction if not there yet
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
         delta = actor->angle - (actor->moveDir << 29);
@@ -3658,7 +3645,7 @@
     }
 
     // turn towards movement direction if not there yet
-    if(actor->moveDir < 8)
+    if(actor->moveDir < DI_NODIR)
     {
         actor->angle &= (7 << 29);
         delta = actor->angle - (actor->moveDir << 29);
@@ -4685,13 +4672,10 @@
     A_AngelFire(mo);
 }
 
-//
-// A_AngelFireAttack
-//
-void C_DECL A_AngelFireAttack(mobj_t *actor)
+void C_DECL A_AngelFireAttack(mobj_t* actor)
 {
-    mobj_t     *fire;
-    int         an;
+    mobj_t*             fire;
+    int                 an;
 
     if(!actor->target)
         return;
@@ -4703,7 +4687,8 @@
 
     S_StartSound(SFX_BAREXP, actor);
     P_DamageMobj(actor->target, actor, actor, 20);
-    actor->target->mom[MZ] = 1000 * FRACUNIT / actor->target->info->mass;
+    actor->target->mom[MZ] =
+        FIX2FLT(1000 * FRACUNIT / actor->target->info->mass);
 
     an = actor->angle >> ANGLETOFINESHIFT;
 
@@ -4713,8 +4698,8 @@
         return;
 
     // Move the fire between the Angel and the player.
-    fire->pos[VX] = actor->target->pos[VX] - FixedMul(24 * FRACUNIT, finecosine[an]);
-    fire->pos[VY] = actor->target->pos[VY] - FixedMul(24 * FRACUNIT, finesine[an]);
+    fire->pos[VX] = actor->target->pos[VX] - 24 * FIX2FLT(finecosine[an]);
+    fire->pos[VY] = actor->target->pos[VY] - 24 * FIX2FLT(finesine[an]);
     P_RadiusAttack(fire, actor, 70, 69);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5747
          http://deng.svn.sourceforge.net/deng/?rev=5747&view=rev
Author:   danij
Date:     2008-06-25 14:41:15 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
All Games: Fixed the non-working knock back thrust in P_DamageMobj2

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/src/p_inter.c
    trunk/doomsday/plugins/jheretic/src/p_inter.c
    trunk/doomsday/plugins/jhexen/src/p_inter.c
    trunk/doomsday/plugins/wolftc/src/p_inter.c

Modified: trunk/doomsday/plugins/jdoom/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_inter.c	2008-06-25 21:38:06 UTC (rev 5746)
+++ trunk/doomsday/plugins/jdoom/src/p_inter.c	2008-06-25 21:41:15 UTC (rev 5747)
@@ -907,7 +907,7 @@
             R_PointToAngle2(inflictor->pos[VX], inflictor->pos[VY],
                             target->pos[VX], target->pos[VY]);
 
-        thrust = FIX2FLT(damage * (1.0f/8) * 100 / target->info->mass);
+        thrust = FIX2FLT(damage * (FRACUNIT>>3) * 100 / target->info->mass);
 
         // Make fall forwards sometimes.
         if(damage < 40 && damage > target->health &&

Modified: trunk/doomsday/plugins/jheretic/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_inter.c	2008-06-25 21:38:06 UTC (rev 5746)
+++ trunk/doomsday/plugins/jheretic/src/p_inter.c	2008-06-25 21:41:15 UTC (rev 5747)
@@ -1251,7 +1251,7 @@
         angle = R_PointToAngle2(inflictor->pos[VX], inflictor->pos[VY],
                                 target->pos[VX], target->pos[VY]);
 
-        thrust = FIX2FLT(damage * (1.0f/8) * 150 / target->info->mass);
+        thrust = FIX2FLT(damage * (FRACUNIT>>3) * 100 / target->info->mass);
 
         // Make fall forwards sometimes.
         if((damage < 40) && (damage > target->health) &&

Modified: trunk/doomsday/plugins/jhexen/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_inter.c	2008-06-25 21:38:06 UTC (rev 5746)
+++ trunk/doomsday/plugins/jhexen/src/p_inter.c	2008-06-25 21:41:15 UTC (rev 5747)
@@ -1819,7 +1819,8 @@
         if(!target->info->mass)
             Con_Error("P_DamageMobj: No target->info->mass!\n");
 
-        thrust = damage * (1.0f/8) * 150 / target->info->mass;
+        thrust = FIX2FLT(damage * (FRACUNIT>>3) * 100 / target->info->mass);
+
         // Make fall forwards sometimes.
         if((damage < 40) && (damage > target->health) &&
            (target->pos[VZ] - inflictor->pos[VZ] > 64) && (P_Random() & 1))

Modified: trunk/doomsday/plugins/wolftc/src/p_inter.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_inter.c	2008-06-25 21:38:06 UTC (rev 5746)
+++ trunk/doomsday/plugins/wolftc/src/p_inter.c	2008-06-25 21:41:15 UTC (rev 5747)
@@ -1202,18 +1202,18 @@
     if(player && gameskill == SM_BABY)
         damage >>= 1;           // take half damage in trainer mode
 
-    // use the cvar damage multiplier netMobDamageModifier
-    // only if the inflictor is not a player
-    if(inflictor && !inflictor->player && (!source || (source && !source->player)))
+    // Use the cvar damage multiplier netMobDamageModifier only if the
+    // inflictor is not a player.
+    if(inflictor && !inflictor->player &&
+       (!source || (source && !source->player)))
     {
-        //damage = (int) ((float) damage * netMobDamageModifier);
+        // damage = (int) ((float) damage * netMobDamageModifier);
         if(IS_NETGAME)
             damage *= cfg.netMobDamageModifier;
     }
 
-    // Some close combat weapons should not
-    // inflict thrust and push the victim out of reach,
-    // thus kick away unless using the chainsaw.
+    // Some close combat weapons should not inflict thrust and push the
+    // victim out of reach, thus kick away unless using the chainsaw.
     if(inflictor && !(target->flags & MF_NOCLIP) &&
        (!source || !source->player ||
         source->player->readyWeapon != WT_EIGHTH) &&
@@ -1223,19 +1223,19 @@
             R_PointToAngle2(inflictor->pos[VX], inflictor->pos[VY],
                             target->pos[VX], target->pos[VY]);
 
-        thrust = damage * (1.0f/8) * 100 / target->info->mass;
+        thrust = FIX2FLT(damage * (FRACUNIT>>3) * 100 / target->info->mass);
 
-        // make fall forwards sometimes
+        // make fall forwards sometimes.
         if(damage < 40 && damage > target->health &&
-           target->pos[VZ] - inflictor->pos[VZ] > 64 * FRACUNIT && (P_Random() & 1))
+           target->pos[VZ] - inflictor->pos[VZ] > 64 && (P_Random() & 1))
         {
             ang += ANG180;
             thrust *= 4;
         }
 
         ang >>= ANGLETOFINESHIFT;
-        target->mom[MX] += FixedMul(thrust, finecosine[ang]);
-        target->mom[MY] += FixedMul(thrust, finesine[ang]);
+        target->mom[MX] += thrust * FIX2FLT(finecosine[ang]);
+        target->mom[MY] += thrust * FIX2FLT(finesine[ang]);
         if(target->dPlayer)
         {
             // Only fix momentum. Otherwise clients will find it difficult
@@ -1243,7 +1243,7 @@
             target->dPlayer->flags |= DDPF_FIXMOM;
         }
 
-        // killough $dropoff_fix: thrust objects hanging off ledges
+        // $dropoff_fix: thrust objects hanging off ledges.
         if(target->intFlags & MIF_FALLING && target->gear >= MAXGEAR)
             target->gear = 0;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5748
          http://deng.svn.sourceforge.net/deng/?rev=5748&view=rev
Author:   danij
Date:     2008-06-25 14:46:16 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
jDoom|jDoom64|jHeretic|WolfTC: Fixed a potential segfault in P_ApplyTorque.

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/src/p_maputl.c
    trunk/doomsday/plugins/jdoom64/src/p_maputl.c
    trunk/doomsday/plugins/jheretic/src/p_maputl.c
    trunk/doomsday/plugins/wolftc/src/p_maputl.c

Modified: trunk/doomsday/plugins/jdoom/src/p_maputl.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_maputl.c	2008-06-25 21:41:15 UTC (rev 5747)
+++ trunk/doomsday/plugins/jdoom/src/p_maputl.c	2008-06-25 21:46:16 UTC (rev 5748)
@@ -78,13 +78,16 @@
     if(tmThing->player)
         return true; // Skip players!
 
-    dx = P_GetFloatp(ld, DMU_DX);
-    dy = P_GetFloatp(ld, DMU_DY);
-
     frontsec = P_GetPtrp(ld, DMU_FRONT_SECTOR);
     backsec = P_GetPtrp(ld, DMU_BACK_SECTOR);
+
+    if(!frontsec || !backsec)
+        return true; // Shouldn't ever happen.
+
     ffloor = P_GetFloatp(frontsec, DMU_FLOOR_HEIGHT);
     bfloor = P_GetFloatp(backsec, DMU_FLOOR_HEIGHT);
+    dx = P_GetFloatp(ld, DMU_DX);
+    dy = P_GetFloatp(ld, DMU_DY);
 
     // Lever-arm:
     dist =

Modified: trunk/doomsday/plugins/jdoom64/src/p_maputl.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_maputl.c	2008-06-25 21:41:15 UTC (rev 5747)
+++ trunk/doomsday/plugins/jdoom64/src/p_maputl.c	2008-06-25 21:46:16 UTC (rev 5748)
@@ -72,20 +72,22 @@
     mobj_t             *mo = tmThing;
     float               dist;
     sector_t           *frontsec, *backsec;
-    float               ffloor;
-    float               bfloor;
+    float               ffloor, bfloor;
     float               dx, dy;
 
     if(tmThing->player)
         return true; // Skip players!
 
-    dx = P_GetFloatp(ld, DMU_DX);
-    dy = P_GetFloatp(ld, DMU_DY);
-
     frontsec = P_GetPtrp(ld, DMU_FRONT_SECTOR);
     backsec = P_GetPtrp(ld, DMU_BACK_SECTOR);
+
+    if(!frontsec || !backsec)
+        return true; // Shouldn't ever happen.
+
     ffloor = P_GetFloatp(frontsec, DMU_FLOOR_HEIGHT);
     bfloor = P_GetFloatp(backsec, DMU_FLOOR_HEIGHT);
+    dx = P_GetFloatp(ld, DMU_DX);
+    dy = P_GetFloatp(ld, DMU_DY);
 
     // Lever-arm:
     dist =

Modified: trunk/doomsday/plugins/jheretic/src/p_maputl.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_maputl.c	2008-06-25 21:41:15 UTC (rev 5747)
+++ trunk/doomsday/plugins/jheretic/src/p_maputl.c	2008-06-25 21:46:16 UTC (rev 5748)
@@ -71,23 +71,25 @@
  */
 static boolean PIT_ApplyTorque(linedef_t *ld, void *data)
 {
-    mobj_t     *mo = tmThing;
-    float       dist;
-    sector_t   *frontsec, *backsec;
-    float       ffloor;
-    float       bfloor;
-    float       dx, dy;
+    mobj_t             *mo = tmThing;
+    float               dist;
+    sector_t           *frontsec, *backsec;
+    float               ffloor, bfloor;
+    float               dx, dy;
 
     if(tmThing->player)
-        return true; // skip players!
+        return true; // Skip players!
 
-    dx = P_GetFloatp(ld, DMU_DX);
-    dy = P_GetFloatp(ld, DMU_DY);
-
     frontsec = P_GetPtrp(ld, DMU_FRONT_SECTOR);
     backsec = P_GetPtrp(ld, DMU_BACK_SECTOR);
+
+    if(!frontsec || !backsec)
+        return true; // Shouldn't ever happen.
+
     ffloor = P_GetFloatp(frontsec, DMU_FLOOR_HEIGHT);
     bfloor = P_GetFloatp(backsec, DMU_FLOOR_HEIGHT);
+    dx = P_GetFloatp(ld, DMU_DX);
+    dy = P_GetFloatp(ld, DMU_DY);
 
     // Lever-arm:
     dist =
@@ -101,11 +103,11 @@
     {
         // At this point, we know that the object straddles a two-sided
         // linedef, and that the object's center of mass is above-ground.
-        float       x = fabs(dx), y = fabs(dy);
+        float       		x = fabs(dx), y = fabs(dy);
 
         if(y > x)
         {
-            float       tmp = x;
+            float       		tmp = x;
             x = y;
             y = tmp;
         }

Modified: trunk/doomsday/plugins/wolftc/src/p_maputl.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_maputl.c	2008-06-25 21:41:15 UTC (rev 5747)
+++ trunk/doomsday/plugins/wolftc/src/p_maputl.c	2008-06-25 21:46:16 UTC (rev 5748)
@@ -72,76 +72,77 @@
  */
 static boolean PIT_ApplyTorque(linedef_t *ld, void *data)
 {
-    mobj_t *mo = tmThing;
-    fixed_t dist;
-    sector_t *frontsec = P_GetPtrp(ld, DMU_FRONT_SECTOR);
-    sector_t *backsec = P_GetPtrp(ld, DMU_BACK_SECTOR);
-    fixed_t ffloor;
-    fixed_t bfloor;
-    fixed_t dx = P_GetFixedp(ld, DMU_DX);
-    fixed_t dy = P_GetFixedp(ld, DMU_DY);
+    mobj_t             *mo = tmThing;
+    float               dist;
+    sector_t           *frontsec, *backsec;
+    float               ffloor, bfloor;
+    float               dx, dy;
 
-    ffloor = P_GetFixedp(frontsec, DMU_FLOOR_HEIGHT);
-    bfloor = P_GetFixedp(backsec, DMU_FLOOR_HEIGHT);
-
     if(tmThing->player)
-        return true;            // skip players!
+        return true; // Skip players!
 
-    dist =                      // lever arm
-        +(dx >> FRACBITS) * (mo->pos[VY] >> FRACBITS) -
-        (dy >> FRACBITS) * (mo->pos[VX] >> FRACBITS) -
-        (dx >> FRACBITS) * (P_GetFixedp(P_GetPtrp(ld, DMU_VERTEX0),
-                                        DMU_Y) >> FRACBITS) +
-        (dy >> FRACBITS) * (P_GetFixedp(P_GetPtrp(ld, DMU_VERTEX0),
-                                        DMU_X) >> FRACBITS);
+    frontsec = P_GetPtrp(ld, DMU_FRONT_SECTOR);
+    backsec = P_GetPtrp(ld, DMU_BACK_SECTOR);
 
-    if((dist < 0 && ffloor < mo->pos[VZ] && bfloor >= mo->pos[VZ]) ||
+    if(!frontsec || !backsec)
+        return true; // Shouldn't ever happen.
+
+    ffloor = P_GetFloatp(frontsec, DMU_FLOOR_HEIGHT);
+    bfloor = P_GetFloatp(backsec, DMU_FLOOR_HEIGHT);
+    dx = P_GetFloatp(ld, DMU_DX);
+    dy = P_GetFloatp(ld, DMU_DY);
+
+    // Lever-arm:
+    dist =
+        +dx * mo->pos[VY] -
+        dy * mo->pos[VX] -
+        dx * (P_GetFloatp(P_GetPtrp(ld, DMU_VERTEX0), DMU_Y)) +
+        dy * (P_GetFloatp(P_GetPtrp(ld, DMU_VERTEX0), DMU_X));
+
+    if((dist < 0  && ffloor < mo->pos[VZ] && bfloor >= mo->pos[VZ]) ||
        (dist >= 0 && bfloor < mo->pos[VZ] && ffloor >= mo->pos[VZ]))
     {
         // At this point, we know that the object straddles a two-sided
         // linedef, and that the object's center of mass is above-ground.
+        float               x = fabs(dx), y = fabs(dy);
 
-        fixed_t x = abs(dx), y = abs(dy);
-
         if(y > x)
         {
-            fixed_t t = x;
-
+            float       tmp = x;
             x = y;
-            y = t;
+            y = tmp;
         }
 
-        y = finesine[(tantoangle[FixedDiv(y, x) >> DBITS] +
-                      ANG90) >> ANGLETOFINESHIFT];
+        y = FIX2FLT(finesine[(tantoangle[FLT2FIX(y / x) >> DBITS] +
+                             ANG90) >> ANGLETOFINESHIFT]);
 
-        // Momentum is proportional to distance between the
-        // object's center of mass and the pivot linedef.
-        //
-        // It is scaled by 2^(OVERDRIVE - gear). When gear is
-        // increased, the momentum gradually decreases to 0 for
-        // the same amount of pseudotorque, so that oscillations
-        // are prevented, yet it has a chance to reach equilibrium.
+        /**
+         * Momentum is proportional to distance between the object's center
+         * of mass and the pivot linedef.
+         *
+         * It is scaled by 2^(OVERDRIVE - gear). When gear is increased, the
+         * momentum gradually decreases to 0 for the same amount of
+         * pseudotorque, so that oscillations are prevented, yet it has a
+         * chance to reach equilibrium.
+         */
 
         if(mo->gear < OVERDRIVE)
-            dist = FixedDiv(FixedMul(dist, y << -(mo->gear - OVERDRIVE)), x);
+            dist = (dist * FIX2FLT(FLT2FIX(y) << -(mo->gear - OVERDRIVE))) / x;
         else
-            dist = FixedDiv(FixedMul(dist, y >> +(mo->gear - OVERDRIVE)), x);
+            dist = (dist * FIX2FLT(FLT2FIX(y) >> +(mo->gear - OVERDRIVE))) / x;
 
         // Apply momentum away from the pivot linedef.
+        x = dy * dist;
+        y = dx * dist;
 
-        x = FixedMul(dy, dist);
-        y = FixedMul(dx, dist);
-
-        // Avoid moving too fast all of a sudden (step into "overdrive")
-
-        dist = FixedMul(x, x) + FixedMul(y, y);
-
-        while(dist > FRACUNIT * 4 && mo->gear < MAXGEAR)
+        // Avoid moving too fast all of a sudden (step into "overdrive").
+        dist = (x * x) + (y * y);
+        while(dist > 4 && mo->gear < MAXGEAR)
         {
             ++mo->gear;
-            x >>= 1;
-            y >>= 1;
-            dist >>= 1;
+            x /= 2;
+            y /= 2;
+            dist /= 2;
         }
 
         mo->mom[MX] -= x;
@@ -151,44 +152,43 @@
     return true;
 }
 
-/*
+/**
  * Applies "torque" to objects, based on all contacted linedefs.
- * killough $dropoff_fix
  */
 void P_ApplyTorque(mobj_t *mo)
 {
-    // Remember the current state, for gear-change
-    int     flags = mo->intFlags;
+    int                 flags = mo->intFlags;
 
-    // 2003-4-16 (jk): corpse sliding anomalies, made configurable
+    // Corpse sliding anomalies, made configurable.
     if(!cfg.slidingCorpses)
         return;
 
     tmThing = mo;
 
-    // Use VALIDCOUNT to prevent checking the same line twice
+    // Use VALIDCOUNT to prevent checking the same line twice.
     VALIDCOUNT++;
 
     P_MobjLinesIterator(mo, PIT_ApplyTorque, 0);
 
-    // If any momentum, mark object as 'falling' using engine-internal flags
-    if(mo->mom[MX] | mo->mom[MY])
+    // If any momentum, mark object as 'falling' using engine-internal
+    // flags.
+    if(mo->mom[MX] != 0 || mo->mom[MY] != 0)
         mo->intFlags |= MIF_FALLING;
     else
         // Clear the engine-internal flag indicating falling object.
         mo->intFlags &= ~MIF_FALLING;
 
-    // If the object has been moving, step up the gear.
-    // This helps reach equilibrium and avoid oscillations.
-    //
-    // Doom has no concept of potential energy, much less
-    // of rotation, so we have to creatively simulate these
-    // systems somehow :)
+    /**
+     * If the object has been moving, step up the gear. This helps reach
+     * equilibrium and avoid oscillations.
+     *
+     * DOOM has no concept of potential energy, much less of rotation, so we
+     * have to creatively simulate these systems somehow :)
+     */
 
-    // If not falling for a while, reset it to full strength
+    // If not falling for a while, reset it to full strength.
     if(!((mo->intFlags | flags) & MIF_FALLING))
         mo->gear = 0;
-    else if(mo->gear < MAXGEAR)
-        // Else if not at max gear, move up a gear
+    else if(mo->gear < MAXGEAR) // Else if not at max gear, move up a gear.
         mo->gear++;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5749
          http://deng.svn.sourceforge.net/deng/?rev=5749&view=rev
Author:   danij
Date:     2008-06-25 14:58:15 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
Fixed: In all games, if a mobj was damaged by a camera player, every time it entered it's pain state it would rotate towards the camera. Given that cameras aren't supposed to be physically present in the world this looked quite odd. It was caused by mobj_t->moveDir not being initialized correctly (to DI_NODIR) when spawned.

Modified Paths:
--------------
    trunk/doomsday/plugins/jheretic/src/p_mobj.c
    trunk/doomsday/plugins/jhexen/src/p_mobj.c
    trunk/doomsday/plugins/wolftc/src/p_mobj.c

Modified: trunk/doomsday/plugins/jheretic/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_mobj.c	2008-06-25 21:46:16 UTC (rev 5748)
+++ trunk/doomsday/plugins/jheretic/src/p_mobj.c	2008-06-25 21:58:15 UTC (rev 5749)
@@ -1068,10 +1068,10 @@
     mo->flags = info->flags;
     mo->flags2 = info->flags2;
     mo->flags3 = info->flags3;
-
     mo->damage = info->damage;
     mo->health =
         info->spawnHealth * (IS_NETGAME ? cfg.netMobHealthModifier : 1);
+    mo->moveDir = DI_NODIR;
 
     if(gameSkill != SM_NIGHTMARE)
         mo->reactionTime = info->reactionTime;

Modified: trunk/doomsday/plugins/jhexen/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_mobj.c	2008-06-25 21:46:16 UTC (rev 5748)
+++ trunk/doomsday/plugins/jhexen/src/p_mobj.c	2008-06-25 21:58:15 UTC (rev 5749)
@@ -1220,6 +1220,7 @@
     mo->damage = info->damage;
     mo->health = info->spawnHealth *
         (IS_NETGAME ? cfg.netMobHealthModifier : 1);
+    mo->moveDir = DI_NODIR;
 
     if(gameSkill != SM_NIGHTMARE)
     {

Modified: trunk/doomsday/plugins/wolftc/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_mobj.c	2008-06-25 21:46:16 UTC (rev 5748)
+++ trunk/doomsday/plugins/wolftc/src/p_mobj.c	2008-06-25 21:58:15 UTC (rev 5749)
@@ -845,9 +845,9 @@
     mo->flags2 = info->flags2;
     mo->flags3 = info->flags3;
     mo->damage = info->damage;
-
     mo->health = info->spawnHealth
                    * (IS_NETGAME ? cfg.netMobHealthModifier : 1);
+    mo->moveDir = DI_NODIR;
 
     P_SetDoomsdayFlags(mo);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5750
          http://deng.svn.sourceforge.net/deng/?rev=5750&view=rev
Author:   danij
Date:     2008-06-25 15:00:16 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
Also initialize mobj_t->moveDir when loading old save games.

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/src/p_oldsvg.c
    trunk/doomsday/plugins/jheretic/src/p_oldsvg.c

Modified: trunk/doomsday/plugins/jdoom/src/p_oldsvg.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_oldsvg.c	2008-06-25 21:58:15 UTC (rev 5749)
+++ trunk/doomsday/plugins/jdoom/src/p_oldsvg.c	2008-06-25 22:00:16 UTC (rev 5750)
@@ -216,6 +216,7 @@
     mo->mom[MZ] = mom[MZ];
     mo->valid = valid;
     mo->type = type;
+    mo->moveDir = DI_NODIR;
 
     /**
      * Continue reading the mobj data.

Modified: trunk/doomsday/plugins/jheretic/src/p_oldsvg.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_oldsvg.c	2008-06-25 21:58:15 UTC (rev 5749)
+++ trunk/doomsday/plugins/jheretic/src/p_oldsvg.c	2008-06-25 22:00:16 UTC (rev 5750)
@@ -252,6 +252,7 @@
     mo->mom[MZ] = mom[MZ];
     mo->valid = valid;
     mo->type = type;
+    mo->moveDir = DI_NODIR;
 
     /**
      * Continue reading the mobj data.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5771
          http://deng.svn.sourceforge.net/deng/?rev=5771&view=rev
Author:   danij
Date:     2008-06-25 20:47:07 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
jHeretic and jHexen were both missing NUM_GAME_STATES from the gamestate_t enum.

Modified Paths:
--------------
    trunk/doomsday/plugins/jheretic/include/doomdef.h
    trunk/doomsday/plugins/jhexen/include/h2def.h

Modified: trunk/doomsday/plugins/jheretic/include/doomdef.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/doomdef.h	2008-06-26 03:25:06 UTC (rev 5770)
+++ trunk/doomsday/plugins/jheretic/include/doomdef.h	2008-06-26 03:47:07 UTC (rev 5771)
@@ -157,7 +157,8 @@
     GS_FINALE,
     GS_DEMOSCREEN,
     GS_WAITING,
-    GS_INFINE
+    GS_INFINE,
+    NUM_GAME_STATES
 } gamestate_t;
 
 /**

Modified: trunk/doomsday/plugins/jhexen/include/h2def.h
===================================================================
--- trunk/doomsday/plugins/jhexen/include/h2def.h	2008-06-26 03:25:06 UTC (rev 5770)
+++ trunk/doomsday/plugins/jhexen/include/h2def.h	2008-06-26 03:47:07 UTC (rev 5771)
@@ -178,7 +178,8 @@
     GS_FINALE,
     GS_DEMOSCREEN,
     GS_WAITING,
-    GS_INFINE
+    GS_INFINE,
+    NUM_GAME_STATES
 } gamestate_t;
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5776
          http://deng.svn.sourceforge.net/deng/?rev=5776&view=rev
Author:   danij
Date:     2008-06-25 23:26:02 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
Fixed various warnings flagged up by gcc.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/src/am_map.c
    trunk/doomsday/plugins/common/src/hu_menu.c
    trunk/doomsday/plugins/jhexen/src/a_action.c
    trunk/doomsday/plugins/jhexen/src/po_man.c
    trunk/doomsday/plugins/wadmapconverter/src/load.c

Modified: trunk/doomsday/plugins/common/src/am_map.c
===================================================================
--- trunk/doomsday/plugins/common/src/am_map.c	2008-06-26 06:06:38 UTC (rev 5775)
+++ trunk/doomsday/plugins/common/src/am_map.c	2008-06-26 06:26:02 UTC (rev 5776)
@@ -2506,16 +2506,17 @@
     }
 }
 
-int renderWallSeg(seg_t *seg, void *data)
+int renderWallSeg(void* obj, void* data)
 {
-    ssecitervars_t *vars = (ssecitervars_t*) data;
-    float       v1[2], v2[2];
-    linedef_t     *line;
-    xline_t    *xLine;
-    sector_t   *frontSector, *backSector;
-    mapobjectinfo_t *info;
-    player_t   *plr = vars->plr;
-    automap_t  *map = vars->map;
+    seg_t*          seg = (seg_t*) obj;
+    ssecitervars_t* vars = (ssecitervars_t*) data;
+    float           v1[2], v2[2];
+    linedef_t*      line;
+    xline_t*        xLine;
+    sector_t*       frontSector, *backSector;
+    mapobjectinfo_t* info;
+    player_t*       plr = vars->plr;
+    automap_t*      map = vars->map;
 
     line = P_GetPtrp(seg, DMU_LINEDEF);
     if(!line)

Modified: trunk/doomsday/plugins/common/src/hu_menu.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_menu.c	2008-06-26 06:06:38 UTC (rev 5775)
+++ trunk/doomsday/plugins/common/src/hu_menu.c	2008-06-26 06:26:02 UTC (rev 5776)
@@ -745,7 +745,7 @@
     LINEHEIGHT,
     0, 4
 };
-#else __JDOOM__
+#else
 static menuitem_t SkillItems[] = {
     // Text defs TXT_SKILL1..5.
     {ITT_EFUNC, 0, "I", M_ChooseSkill, 0, &skillModeNames[0]},

Modified: trunk/doomsday/plugins/jhexen/src/a_action.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/a_action.c	2008-06-26 06:06:38 UTC (rev 5775)
+++ trunk/doomsday/plugins/jhexen/src/a_action.c	2008-06-26 06:26:02 UTC (rev 5776)
@@ -1009,7 +1009,7 @@
 
     // Handle Z movement
     actor->pos[VZ] =
-        actor->target->pos[VZ] + 2 * FLOATBOBOFFSET(actor->args[0]);
+        actor->target->pos[VZ] + 2 * FLOATBOBOFFSET((int) actor->args[0]);
     actor->args[0] = (actor->args[0] + 3) & 63;
 }
 

Modified: trunk/doomsday/plugins/jhexen/src/po_man.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/po_man.c	2008-06-26 06:06:38 UTC (rev 5775)
+++ trunk/doomsday/plugins/jhexen/src/po_man.c	2008-06-26 06:26:02 UTC (rev 5776)
@@ -62,7 +62,7 @@
 // PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
 
 static int getPolyobjMirror(uint polyNum);
-static void thrustMobj(mobj_t *mobj, seg_t *seg, polyobj_t *po);
+static void thrustMobj(struct mobj_s* mo, void* segp, void* pop);
 
 // EXTERNAL DATA DECLARATIONS ----------------------------------------------
 
@@ -571,8 +571,10 @@
     return 0;
 }
 
-static void thrustMobj(mobj_t* mobj, seg_t* seg, polyobj_t* po)
+static void thrustMobj(struct mobj_s* mo, void* segp, void* pop)
 {
+    seg_t*              seg = (seg_t*) segp;
+    polyobj_t*          po = (polyobj_t*) pop;
     uint                thrustAn;
     float               thrustX, thrustY, force;
     polyevent_t*        pe;
@@ -581,10 +583,10 @@
     if(IS_CLIENT)
         return;
 
-    if(P_IsCamera(mobj)) // Cameras don't interact with polyobjs.
+    if(P_IsCamera(mo)) // Cameras don't interact with polyobjs.
         return;
 
-    if(!(mobj->flags & MF_SHOOTABLE) && !mobj->player)
+    if(!(mo->flags & MF_SHOOTABLE) && !mo->player)
         return;
 
     thrustAn =
@@ -618,15 +620,15 @@
 
     thrustX = force * FIX2FLT(finecosine[thrustAn]);
     thrustY = force * FIX2FLT(finesine[thrustAn]);
-    mobj->mom[MX] += thrustX;
-    mobj->mom[MY] += thrustY;
+    mo->mom[MX] += thrustX;
+    mo->mom[MY] += thrustY;
 
     if(po->crush)
     {
-        if(!P_CheckPosition2f(mobj, mobj->pos[VX] + thrustX,
-                              mobj->pos[VY] + thrustY))
+        if(!P_CheckPosition2f(mo, mo->pos[VX] + thrustX,
+                              mo->pos[VY] + thrustY))
         {
-            P_DamageMobj(mobj, NULL, NULL, 3);
+            P_DamageMobj(mo, NULL, NULL, 3);
         }
     }
 }

Modified: trunk/doomsday/plugins/wadmapconverter/src/load.c
===================================================================
--- trunk/doomsday/plugins/wadmapconverter/src/load.c	2008-06-26 06:06:38 UTC (rev 5775)
+++ trunk/doomsday/plugins/wadmapconverter/src/load.c	2008-06-26 06:26:02 UTC (rev 5776)
@@ -488,7 +488,7 @@
             lineList[PolyLineCount] = 0; // Terminate.
 
             seqType = line->xArgs[2];
-            if(seqType < 0 || seqType >= SEQTYPE_NUMSEQ)
+            if(seqType >= SEQTYPE_NUMSEQ)
                 seqType = 0;
 
             if(createPolyobj(lineList, PolyLineCount, &poIdx, tag,
@@ -831,7 +831,6 @@
                 l->sides[RIGHT] = 0;
             else
                 l->sides[RIGHT] = idx + 1;
-            idx = (short) (ptr+12);
             idx = USHORT(*((const uint16_t*) (ptr+12)));
             if(idx == 0xFFFF)
                 l->sides[LEFT] = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5812
          http://deng.svn.sourceforge.net/deng/?rev=5812&view=rev
Author:   danij
Date:     2008-07-05 12:33:20 -0700 (Sat, 05 Jul 2008)

Log Message:
-----------
Fixed: Bug #2001999 - Use sound played when an XG line activation requires a key and the trigger event type is not XLE_USE.
Added (jDoom/jheretic/jDoom64/WolfTC): Paramater substitution of keyname into the various "This object requires <keyname>" strings and added new text defs for the key names themselves.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/include/am_map.h
    trunk/doomsday/plugins/common/src/am_map.c
    trunk/doomsday/plugins/common/src/hu_menu.c
    trunk/doomsday/plugins/common/src/p_door.c
    trunk/doomsday/plugins/common/src/p_xgline.c
    trunk/doomsday/plugins/jdoom/defs/text.ded
    trunk/doomsday/plugins/jdoom/include/d_englsh.h
    trunk/doomsday/plugins/jdoom/include/info.h
    trunk/doomsday/plugins/jdoom64/defs/text.ded
    trunk/doomsday/plugins/jdoom64/include/d_englsh.h
    trunk/doomsday/plugins/jdoom64/include/info.h
    trunk/doomsday/plugins/jheretic/defs/text.ded
    trunk/doomsday/plugins/jheretic/include/dstrings.h
    trunk/doomsday/plugins/jheretic/include/info.h
    trunk/doomsday/plugins/wolftc/defs/text.ded
    trunk/doomsday/plugins/wolftc/include/d_englsh.h
    trunk/doomsday/plugins/wolftc/include/info.h

Modified: trunk/doomsday/plugins/common/include/am_map.h
===================================================================
--- trunk/doomsday/plugins/common/include/am_map.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/common/include/am_map.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -89,12 +89,12 @@
 #define BACKGROUND      BLACK
 
 // Keys for Baby Mode
-#define KEY1   197      //  Blue Key
-#define KEY2   (256-5*16)   //  Red Key
-#define KEY3   (256-32+7)   //  Yellow Key
-#define KEY4   (256-32+7)   //  Yellow Skull
-#define KEY5   (256-5*16)   //  Red Skull
-#define KEY6   197      //  Blue Skull
+#define KEY1_COLOR   197      //  Blue Key
+#define KEY2_COLOR   (256-5*16)   //  Red Key
+#define KEY3_COLOR   (256-32+7)   //  Yellow Key
+#define KEY4_COLOR   (256-32+7)   //  Yellow Skull
+#define KEY5_COLOR   (256-5*16)   //  Red Skull
+#define KEY6_COLOR   197      //  Blue Skull
 
 #define BORDERGRAPHIC "brdr_b"
 
@@ -164,9 +164,9 @@
 #define BORDEROFFSET 4
 
 // Keys for Baby Mode
-#define KEY1   144  // HERETIC - Green Key
-#define KEY2   197  // HERETIC - Yellow Key
-#define KEY3   220  // HERETIC - Blue Key
+#define KEY1_COLOR   144  // HERETIC - Green Key
+#define KEY2_COLOR   197  // HERETIC - Yellow Key
+#define KEY3_COLOR   220  // HERETIC - Blue Key
 
 #define BORDERGRAPHIC "bordb"
 

Modified: trunk/doomsday/plugins/common/src/am_map.c
===================================================================
--- trunk/doomsday/plugins/common/src/am_map.c	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/common/src/am_map.c	2008-07-05 19:33:20 UTC (rev 5812)
@@ -461,10 +461,10 @@
 };
 #elif __JHERETIC__
 static int their_colors[] = {
-    KEY3,
-    KEY2,
+    KEY3_COLOR,
+    KEY2_COLOR,
     BLOODRED,
-    KEY1
+    KEY1_COLOR
 };
 #else
 static int their_colors[] = {
@@ -2844,16 +2844,16 @@
     } keyColors[] =
     {
 #if __JDOOM__ || __JDOOM64__
-        {MT_MISC4, KEY1},
-        {MT_MISC5, KEY2},
-        {MT_MISC6, KEY3},
-        {MT_MISC7, KEY4},
-        {MT_MISC8, KEY5},
-        {MT_MISC9, KEY6},
+        {MT_MISC4, KEY1_COLOR},
+        {MT_MISC5, KEY2_COLOR},
+        {MT_MISC6, KEY3_COLOR},
+        {MT_MISC7, KEY4_COLOR},
+        {MT_MISC8, KEY5_COLOR},
+        {MT_MISC9, KEY6_COLOR},
 #elif __JHERETIC__
-        {MT_CKEY, KEY1},
-        {MT_BKYY, KEY2},
-        {MT_AKYY, KEY3},
+        {MT_CKEY, KEY1_COLOR},
+        {MT_BKYY, KEY2_COLOR},
+        {MT_AKYY, KEY3_COLOR},
 #endif
         {-1, -1} // Terminate.
     };

Modified: trunk/doomsday/plugins/common/src/hu_menu.c
===================================================================
--- trunk/doomsday/plugins/common/src/hu_menu.c	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/common/src/hu_menu.c	2008-07-05 19:33:20 UTC (rev 5812)
@@ -3111,14 +3111,14 @@
     for(i = 0; i < NUM_WEAPON_TYPES; ++i)
     {
 #if __JDOOM__ || __JDOOM64__
-        M_WriteMenuText(menu, 4+i, GET_TXT(TXT_WEAPON0 + cfg.weaponOrder[i]));
+        M_WriteMenuText(menu, 4+i, GET_TXT(TXT_WEAPON1 + cfg.weaponOrder[i]));
 #elif __JHERETIC__
         /**
          * \fixme We should allow different weapon preferences per player
          * class. However, since the only other class in jHeretic is the
          * chicken which has only 1 weapon anyway -we'll just show the
          * names of the player's weapons for now.
-	     */
+         */
         M_WriteMenuText(menu, 4+i, GET_TXT(TXT_TXT_WPNSTAFF + cfg.weaponOrder[i]));
 #elif __JHEXEN__
         /**

Modified: trunk/doomsday/plugins/common/src/p_door.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_door.c	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/common/src/p_door.c	2008-07-05 19:33:20 UTC (rev 5812)
@@ -528,6 +528,37 @@
     return true;
 }
 
+static void sendNeedKeyMessage(player_t* p, textenum_t msgTxt, int keyNum)
+{
+    char                buf[160], *in, tmp[2];
+
+    buf[0] = 0;
+    tmp[1] = 0;
+
+    // Get the message template.
+    in = GET_TXT(msgTxt);
+
+    for(; *in; in++)
+    {
+        if(in[0] == '%')
+        {
+            if(in[1] == '1')
+            {
+                strcat(buf, GET_TXT(TXT_KEY1 + keyNum));
+                in++;
+                continue;
+            }
+
+            if(in[1] == '%')
+                in++;
+        }
+        tmp[0] = *in;
+        strcat(buf, tmp);
+    }
+
+    P_SetMessage(p, buf, false);
+}
+
 /**
  * Checks whether the given linedef is a locked manual door.
  * If locked and the player IS ABLE to open it, return @c true.
@@ -539,9 +570,13 @@
 {
     xline_t*            xline = P_ToXLine(line);
     player_t*           p;
+    int                 keyNum = -1;
+    textenum_t          msgTxt = 0;
+    sfxenum_t           sfxNum = 0;
 
     if(!mo || !xline)
         return false;
+
     p = mo->player;
 
 #if !__JHEXEN__
@@ -559,16 +594,16 @@
 # if __JHERETIC__
         if(!p->keys[KT_BLUE])
         {
-            P_SetMessage(p, TXT_NEEDBLUEKEY, false);
-            S_ConsoleSound(SFX_DOORLOCKED, NULL, p - players);
-            return false;
+            msgTxt = TXT_TXT_NEEDBLUEKEY;
+            keyNum = 2;
+            sfxNum = SFX_DOORLOCKED;
         }
 # else
         if(!p->keys[KT_BLUECARD] && !p->keys[KT_BLUESKULL])
         {
-            P_SetMessage(p, PD_BLUEK, false);
-            S_StartSound(SFX_DOORLOCKED, p->plr->mo);
-            return false;
+            msgTxt = TXT_PD_BLUEK;
+            keyNum = 0;
+            sfxNum = SFX_DOORLOCKED;
         }
 # endif
         break;
@@ -585,16 +620,16 @@
 # if __JHERETIC__
         if(!p->keys[KT_YELLOW])
         {
-            P_SetMessage(p, TXT_NEEDYELLOWKEY, false);
-            S_ConsoleSound(SFX_DOORLOCKED, NULL, p - players);
-            return false;
+            msgTxt = TXT_TXT_NEEDYELLOWKEY;
+            keyNum = 0;
+            sfxNum = SFX_DOORLOCKED;
         }
 # else
         if(!p->keys[KT_YELLOWCARD] && !p->keys[KT_YELLOWSKULL])
         {
-            P_SetMessage(p, PD_YELLOWK, false);
-            S_StartSound(SFX_DOORLOCKED, p->plr->mo);
-            return false;
+            msgTxt = TXT_PD_YELLOWK;
+            keyNum = 1;
+            sfxNum = SFX_DOORLOCKED;
         }
 # endif
         break;
@@ -611,17 +646,17 @@
         // Green lock
         if(!p->keys[KT_GREEN])
         {
-            P_SetMessage(p, TXT_NEEDGREENKEY, false);
-            S_ConsoleSound(SFX_DOORLOCKED, NULL, p - players);
-            return false;
+            msgTxt = TXT_TXT_NEEDGREENKEY;
+            keyNum = 1;
+            sfxNum = SFX_DOORLOCKED;
         }
 # else
         // Red lock
         if(!p->keys[KT_REDCARD] && !p->keys[KT_REDSKULL])
         {
-            P_SetMessage(p, PD_REDK, false);
-            S_StartSound(SFX_DOORLOCKED, p->plr->mo);
-            return false;
+            msgTxt = TXT_PD_REDK;
+            keyNum = 2;
+            sfxNum = SFX_DOORLOCKED;
         }
 # endif
         break;
@@ -631,6 +666,13 @@
     }
 #endif
 
+    if(keyNum != -1)
+    {   // A key is required.
+        sendNeedKeyMessage(p, msgTxt, keyNum);
+        S_StartSound(sfxNum, p->plr->mo);
+        return false;
+    }
+
     return true;
 }
 

Modified: trunk/doomsday/plugins/common/src/p_xgline.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_xgline.c	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/common/src/p_xgline.c	2008-07-05 19:33:20 UTC (rev 5812)
@@ -2163,40 +2163,41 @@
 /**
  * XL_CheckKeys
  */
-boolean XL_CheckKeys(mobj_t *mo, int flags2)
+boolean XL_CheckKeys(mobj_t* mo, int flags2, boolean doMsg, boolean doSfx)
 {
-    player_t *act = mo->player;
-
+    player_t*           act = mo->player;
 #if __JDOOM__ || __JDOOM64__
-    int     num = 6;
-    char   *keystr[] = {
-        "BLUE KEYCARD", "YELLOW KEYCARD", "RED KEYCARD",
-        "BLUE SKULL KEY", "YELLOW SKULL KEY", "RED SKULL KEY"
-    };
-    int    *keys = (int *) act->keys;
-    int     badsound = SFX_OOF;
+    int                 num = 6;
+    int*                keys = (int *) act->keys;
+    int                 badsound = SFX_OOF;
 #elif __JHERETIC__
-    int     num = 3;
-    char   *keystr[] = { "YELLOW KEY", "GREEN KEY", "BLUE KEY" };
-    boolean *keys = act->keys;
-    int     badsound = SFX_PLROOF;
+    int                 num = 3;
+    boolean*            keys = act->keys;
+    int                 badsound = SFX_PLROOF;
 #elif __JSTRIFE__
 //// \fixme FIXME!!!
-    int     num = 3;
-    char   *keystr[] = { "YELLOW KEY", "GREEN KEY", "BLUE KEY" };
-    int    *keys = (int *) act->keys;
-    int     badsound = SFX_NONE;
+    int                 num = 3;
+    int*                keys = (int *) act->keys;
+    int                 badsound = SFX_NONE;
 #endif
-    int     i;
+    int                 i;
 
     for(i = 0; i < num; ++i)
     {
         if((flags2 & LTF2_KEY(i)) && !keys[i])
         {   // This key is missing!
-            // Show a message.
-            sprintf(msgbuf, "YOU NEED A %s.", keystr[i]);
-            XL_Message(mo, msgbuf, false);
-            S_ConsoleSound(badsound, mo, act - players);
+
+            // Show a message?
+            if(doMsg)
+            {
+                sprintf(msgbuf, "YOU NEED A %s.", GET_TXT(TXT_KEY1 + i));
+                XL_Message(mo, msgbuf, false);
+            }
+
+            // Play a sound?
+            if(doSfx)
+                S_ConsoleSound(badsound, mo, act - players);
+
             return false;
         }
     }
@@ -2466,7 +2467,8 @@
         }
 
         // Check that all the flagged keys are present.
-        if(!XL_CheckKeys(activator_thing, info->flags2))
+        if(!XL_CheckKeys(activator_thing, info->flags2, true,
+                         (evtype == XLE_USE? true : false)))
         {
             XG_Dev("  Line %i: ABORTING EVENT due to missing key", P_ToIndex(line));
             return false;        // Keys missing!
@@ -2699,10 +2701,10 @@
          * Apply to both sides of the line.
          * These are group offsets. All surfaces on a given side are moved
          * using the same texmove speed/angle.
-	     *
-	     * \todo Implement per-surface texture movement also which would
+         *
+         * \todo Implement per-surface texture movement also which would
          * be added to each independantly.
-	     */
+         */
 
         // Front side.
         side = P_GetPtrp(line, DMU_SIDEDEF0);

Modified: trunk/doomsday/plugins/jdoom/defs/text.ded
===================================================================
--- trunk/doomsday/plugins/jdoom/defs/text.ded	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jdoom/defs/text.ded	2008-07-05 19:33:20 UTC (rev 5812)
@@ -332,32 +332,32 @@
 
 Text {
   ID = "PD_BLUEO";
-  Text = "You need a blue key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_REDO";
-  Text = "You need a red key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_YELLOWO";
-  Text = "You need a yellow key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_BLUEK";
-  Text = "You need a blue key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
   ID = "PD_REDK";
-  Text = "You need a red key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
   ID = "PD_YELLOWK";
-  Text = "You need a yellow key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
@@ -1944,3 +1944,32 @@
   Text = "Nightmare!";
 }
 
+Text {
+  ID = "KEY1";
+  Text = "Blue Keycard";
+}
+
+Text {
+  ID = "KEY2";
+  Text = "Yellow Keycard";
+}
+
+Text {
+  ID = "KEY3";
+  Text = "Red Keycard";
+}
+
+Text {
+  ID = "KEY4";
+  Text = "Blue Skull Key";
+}
+
+Text {
+  ID = "KEY5";
+  Text = "Yellow Skull Key";
+}
+
+Text {
+  ID = "KEY6";
+  Text = "Red Skull Key";
+}

Modified: trunk/doomsday/plugins/jdoom/include/d_englsh.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/d_englsh.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jdoom/include/d_englsh.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -290,8 +290,15 @@
 #define AMSTR_MARKEDSPOT    GET_TXT(TXT_AMSTR_MARKEDSPOT)
 #define AMSTR_MARKSCLEARED  GET_TXT(TXT_AMSTR_MARKSCLEARED)
 
+// Key names:
+#define KEY1                GET_TXT(TXT_KEY1)
+#define KEY2                GET_TXT(TXT_KEY2)
+#define KEY3                GET_TXT(TXT_KEY3)
+#define KEY4                GET_TXT(TXT_KEY4)
+#define KEY5                GET_TXT(TXT_KEY5)
+#define KEY6                GET_TXT(TXT_KEY6)
+
 // Weapon names:
-#define WEAPON0             GET_TXT(TXT_WEAPON0)
 #define WEAPON1             GET_TXT(TXT_WEAPON1)
 #define WEAPON2             GET_TXT(TXT_WEAPON2)
 #define WEAPON3             GET_TXT(TXT_WEAPON3)
@@ -300,6 +307,7 @@
 #define WEAPON6             GET_TXT(TXT_WEAPON6)
 #define WEAPON7             GET_TXT(TXT_WEAPON7)
 #define WEAPON8             GET_TXT(TXT_WEAPON8)
+#define WEAPON9             GET_TXT(TXT_WEAPON9)
 
 #define STSTR_MUS           GET_TXT(TXT_STSTR_MUS)
 #define STSTR_NOMUS         GET_TXT(TXT_STSTR_NOMUS)

Modified: trunk/doomsday/plugins/jdoom/include/info.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/info.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jdoom/include/info.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -1648,20 +1648,26 @@
     TXT_KILLMSG_STOMP,
     TXT_AMSTR_ROTATEON,
     TXT_AMSTR_ROTATEOFF,
-    TXT_WEAPON0,
     TXT_WEAPON1,
     TXT_WEAPON2,
-    TXT_WEAPON3,                    // 340
-    TXT_WEAPON4,
+    TXT_WEAPON3,
+    TXT_WEAPON4,                    // 340
     TXT_WEAPON5,
     TXT_WEAPON6,
     TXT_WEAPON7,
     TXT_WEAPON8,
+    TXT_WEAPON9,
     TXT_SKILL1,
     TXT_SKILL2,
     TXT_SKILL3,
     TXT_SKILL4,
     TXT_SKILL5,                     // 350
+    TXT_KEY1,
+    TXT_KEY2,
+    TXT_KEY3,
+    TXT_KEY4,
+    TXT_KEY5,
+    TXT_KEY6,
     NUMTEXT
 } textenum_t;
 

Modified: trunk/doomsday/plugins/jdoom64/defs/text.ded
===================================================================
--- trunk/doomsday/plugins/jdoom64/defs/text.ded	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jdoom64/defs/text.ded	2008-07-05 19:33:20 UTC (rev 5812)
@@ -349,32 +349,32 @@
 
 Text {
   ID = "PD_BLUEO";
-  Text = "You need a blue key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_REDO";
-  Text = "You need a red key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_YELLOWO";
-  Text = "You need a yellow key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_BLUEK";
-  Text = "You need a blue key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
   ID = "PD_REDK";
-  Text = "You need a red key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
   ID = "PD_YELLOWK";
-  Text = "You need a yellow key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
@@ -1179,3 +1179,33 @@
   ID = "SKILL4";
   Text = "Watch me die!";
 }
+
+Text {
+  ID = "KEY1";
+  Text = "Blue Keycard";
+}
+
+Text {
+  ID = "KEY2";
+  Text = "Yellow Keycard";
+}
+
+Text {
+  ID = "KEY3";
+  Text = "Red Keycard";
+}
+
+Text {
+  ID = "KEY4";
+  Text = "Blue Skull Key";
+}
+
+Text {
+  ID = "KEY5";
+  Text = "Yellow Skull Key";
+}
+
+Text {
+  ID = "KEY6";
+  Text = "Red Skull Key";
+}

Modified: trunk/doomsday/plugins/jdoom64/include/d_englsh.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/d_englsh.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jdoom64/include/d_englsh.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -163,8 +163,15 @@
 #define AMSTR_MARKEDSPOT    GET_TXT(TXT_AMSTR_MARKEDSPOT)
 #define AMSTR_MARKSCLEARED  GET_TXT(TXT_AMSTR_MARKSCLEARED)
 
+// Key names:
+#define KEY1                GET_TXT(TXT_KEY1)
+#define KEY2                GET_TXT(TXT_KEY2)
+#define KEY3                GET_TXT(TXT_KEY3)
+#define KEY4                GET_TXT(TXT_KEY4)
+#define KEY5                GET_TXT(TXT_KEY5)
+#define KEY6                GET_TXT(TXT_KEY6)
+
 // Weapon names:
-#define WEAPON0             GET_TXT(TXT_WEAPON0)
 #define WEAPON1             GET_TXT(TXT_WEAPON1)
 #define WEAPON2             GET_TXT(TXT_WEAPON2)
 #define WEAPON3             GET_TXT(TXT_WEAPON3)
@@ -173,7 +180,8 @@
 #define WEAPON6             GET_TXT(TXT_WEAPON6)
 #define WEAPON7             GET_TXT(TXT_WEAPON7)
 #define WEAPON8             GET_TXT(TXT_WEAPON8)
-#define WEAPON9             GET_TXT(TXT_WEAPON9) // jd64
+#define WEAPON9             GET_TXT(TXT_WEAPON9)
+#define WEAPON10            GET_TXT(TXT_WEAPON10) // jd64
 
 #define STSTR_MUS           GET_TXT(TXT_STSTR_MUS)
 #define STSTR_NOMUS         GET_TXT(TXT_STSTR_NOMUS)

Modified: trunk/doomsday/plugins/jdoom64/include/info.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/info.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jdoom64/include/info.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -1566,7 +1566,6 @@
     TXT_KILLMSG_STOMP,
     TXT_AMSTR_ROTATEON,
     TXT_AMSTR_ROTATEOFF,
-    TXT_WEAPON0,
     TXT_WEAPON1,
     TXT_WEAPON2,
     TXT_WEAPON3,
@@ -1576,10 +1575,17 @@
     TXT_WEAPON7,
     TXT_WEAPON8,
     TXT_WEAPON9,
+    TXT_WEAPON10,
     TXT_SKILL1,
     TXT_SKILL2,
     TXT_SKILL3,
     TXT_SKILL4,
+    TXT_KEY1,
+    TXT_KEY2,
+    TXT_KEY3,
+    TXT_KEY4,
+    TXT_KEY5,
+    TXT_KEY6,
     NUMTEXT
 } textenum_t;
 

Modified: trunk/doomsday/plugins/jheretic/defs/text.ded
===================================================================
--- trunk/doomsday/plugins/jheretic/defs/text.ded	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jheretic/defs/text.ded	2008-07-05 19:33:20 UTC (rev 5812)
@@ -464,17 +464,17 @@
 
 Text {
   ID = "TXT_NEEDBLUEKEY";
-  Text = "YOU NEED A BLUE KEY TO OPEN THIS DOOR";
+  Text = "YOU NEED A %1 TO OPEN THIS DOOR";
 }
 
 Text {
   ID = "TXT_NEEDGREENKEY";
-  Text = "YOU NEED A GREEN KEY TO OPEN THIS DOOR";
+  Text = "YOU NEED A %1 TO OPEN THIS DOOR";
 }
 
 Text {
   ID = "TXT_NEEDYELLOWKEY";
-  Text = "YOU NEED A YELLOW KEY TO OPEN THIS DOOR";
+  Text = "YOU NEED A %1 TO OPEN THIS DOOR";
 }
 
 Text {
@@ -812,4 +812,19 @@
 Text {
   ID = "AMSTR_ROTATEOFF";
   Text = "Rotate mode OFF";
-}
\ No newline at end of file
+}
+
+Text {
+  ID = "KEY1";
+  Text = "Yellow Key";
+}
+
+Text {
+  ID = "KEY2";
+  Text = "Green Key";
+}
+
+Text {
+  ID = "KEY3";
+  Text = "Blue Key";
+}

Modified: trunk/doomsday/plugins/jheretic/include/dstrings.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/dstrings.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jheretic/include/dstrings.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -4,7 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2007 Jaakko Keränen <skyjake@...>
- *\author Copyright © 2005-2007 Daniel Swanson <danij@...>
+ *\author Copyright © 2005-2008 Daniel Swanson <danij@...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,14 +85,12 @@
 //
 //---------------------------------------------------------------------------
 
-// Keys
-
+// Pickup Key messages:
 #define TXT_GOTBLUEKEY GET_TXT(TXT_TXT_GOTBLUEKEY)
 #define TXT_GOTYELLOWKEY GET_TXT(TXT_TXT_GOTYELLOWKEY)
 #define TXT_GOTGREENKEY GET_TXT(TXT_TXT_GOTGREENKEY)
 
 // Artifacts
-
 #define TXT_ARTIHEALTH GET_TXT(TXT_TXT_ARTIHEALTH)
 #define TXT_ARTIFLY GET_TXT(TXT_TXT_ARTIFLY)
 #define TXT_ARTIINVULNERABILITY GET_TXT(TXT_TXT_ARTIINVULNERABILITY)
@@ -127,14 +125,18 @@
 #define TXT_AMMOPHOENIXROD1 GET_TXT(TXT_TXT_AMMOPHOENIXROD1)
 #define TXT_AMMOPHOENIXROD2 GET_TXT(TXT_TXT_AMMOPHOENIXROD2)
 
-// Weapons
+// Key names:
+#define KEY1                GET_TXT(TXT_KEY1)
+#define KEY2                GET_TXT(TXT_KEY2)
+#define KEY3                GET_TXT(TXT_KEY3)
 
-#define TXT_WPNMACE GET_TXT(TXT_TXT_WPNMACE)
-#define TXT_WPNCROSSBOW GET_TXT(TXT_TXT_WPNCROSSBOW)
-#define TXT_WPNBLASTER GET_TXT(TXT_TXT_WPNBLASTER)
-#define TXT_WPNSKULLROD GET_TXT(TXT_TXT_WPNSKULLROD)
-#define TXT_WPNPHOENIXROD GET_TXT(TXT_TXT_WPNPHOENIXROD)
-#define TXT_WPNGAUNTLETS GET_TXT(TXT_TXT_WPNGAUNTLETS)
+// Weapon names:
+#define TXT_WPNMACE         GET_TXT(TXT_TXT_WPNMACE)
+#define TXT_WPNCROSSBOW     GET_TXT(TXT_TXT_WPNCROSSBOW)
+#define TXT_WPNBLASTER      GET_TXT(TXT_TXT_WPNBLASTER)
+#define TXT_WPNSKULLROD     GET_TXT(TXT_TXT_WPNSKULLROD)
+#define TXT_WPNPHOENIXROD   GET_TXT(TXT_TXT_WPNPHOENIXROD)
+#define TXT_WPNGAUNTLETS    GET_TXT(TXT_TXT_WPNGAUNTLETS)
 
 //---------------------------------------------------------------------------
 //

Modified: trunk/doomsday/plugins/jheretic/include/info.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/info.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/jheretic/include/info.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -4,7 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2008 Jaakko Keränen <jaakko.keranen@...>
- *\author Copyright © 2005-2006 Daniel Swanson <danij@...>
+ *\author Copyright © 2005-2008 Daniel Swanson <danij@...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1697,6 +1697,9 @@
     TXT_EPISODE5,
     TXT_AMSTR_ROTATEON,
     TXT_AMSTR_ROTATEOFF,
+    TXT_KEY1,
+    TXT_KEY2,
+    TXT_KEY3,
     NUMTEXT
 } textenum_t;
 

Modified: trunk/doomsday/plugins/wolftc/defs/text.ded
===================================================================
--- trunk/doomsday/plugins/wolftc/defs/text.ded	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/wolftc/defs/text.ded	2008-07-05 19:33:20 UTC (rev 5812)
@@ -333,32 +333,32 @@
 
 Text {
   ID = "PD_BLUEO";
-  Text = "You need a blue key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_REDO";
-  Text = "You need a red key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_YELLOWO";
-  Text = "You need a yellow key to activate this object";
+  Text = "You need a %1 to activate this object";
 }
 
 Text {
   ID = "PD_BLUEK";
-  Text = "You need a blue key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
   ID = "PD_REDK";
-  Text = "You need a red key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
   ID = "PD_YELLOWK";
-  Text = "You need a yellow key to open this door";
+  Text = "You need a %1 to open this door";
 }
 
 Text {
@@ -1945,6 +1945,36 @@
   Text = "Nightmare!";
 }
 
+Text {
+  ID = "KEY1";
+  Text = "Blue Keycard";
+}
+
+Text {
+  ID = "KEY2";
+  Text = "Yellow Keycard";
+}
+
+Text {
+  ID = "KEY3";
+  Text = "Red Keycard";
+}
+
+Text {
+  ID = "KEY4";
+  Text = "Blue Skull Key";
+}
+
+Text {
+  ID = "KEY5";
+  Text = "Yellow Skull Key";
+}
+
+Text {
+  ID = "KEY6";
+  Text = "Red Skull Key";
+}
+
 #--------------------------------------------------------
 #-------------------WOLFTC TEXT--------------------------
 #--------------------------------------------------------

Modified: trunk/doomsday/plugins/wolftc/include/d_englsh.h
===================================================================
--- trunk/doomsday/plugins/wolftc/include/d_englsh.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/wolftc/include/d_englsh.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -4,7 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2008 Jaakko Keränen <jaakko.keranen@...>
- *\author Copyright © 2005-2006 Daniel Swanson <danij@...>
+ *\author Copyright © 2005-2008 Daniel Swanson <danij@...>
  *\author Copyright © 1993-1996 by id Software, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
 
@@ -331,17 +331,24 @@
 #define AMSTR_MARKEDSPOT GET_TXT(TXT_AMSTR_MARKEDSPOT)
 #define AMSTR_MARKSCLEARED GET_TXT(TXT_AMSTR_MARKSCLEARED)
 
-// Weapon names
+// Key names:
+#define KEY1                GET_TXT(TXT_KEY1)
+#define KEY2                GET_TXT(TXT_KEY2)
+#define KEY3                GET_TXT(TXT_KEY3)
+#define KEY4                GET_TXT(TXT_KEY4)
+#define KEY5                GET_TXT(TXT_KEY5)
+#define KEY6                GET_TXT(TXT_KEY6)
 
-#define WEAPON0 GET_TXT(TXT_WEAPON0)
-#define WEAPON1 GET_TXT(TXT_WEAPON1)
-#define WEAPON2 GET_TXT(TXT_WEAPON2)
-#define WEAPON3 GET_TXT(TXT_WEAPON3)
-#define WEAPON4 GET_TXT(TXT_WEAPON4)
-#define WEAPON5 GET_TXT(TXT_WEAPON5)
-#define WEAPON6 GET_TXT(TXT_WEAPON6)
-#define WEAPON7 GET_TXT(TXT_WEAPON7)
-#define WEAPON8 GET_TXT(TXT_WEAPON8)
+// Weapon names:
+#define WEAPON1             GET_TXT(TXT_WEAPON1)
+#define WEAPON2             GET_TXT(TXT_WEAPON2)
+#define WEAPON3             GET_TXT(TXT_WEAPON3)
+#define WEAPON4             GET_TXT(TXT_WEAPON4)
+#define WEAPON5             GET_TXT(TXT_WEAPON5)
+#define WEAPON6             GET_TXT(TXT_WEAPON6)
+#define WEAPON7             GET_TXT(TXT_WEAPON7)
+#define WEAPON8             GET_TXT(TXT_WEAPON8)
+#define WEAPON9             GET_TXT(TXT_WEAPON9)
 
 //
 //  ST_stuff.C

Modified: trunk/doomsday/plugins/wolftc/include/info.h
===================================================================
--- trunk/doomsday/plugins/wolftc/include/info.h	2008-07-05 17:15:02 UTC (rev 5811)
+++ trunk/doomsday/plugins/wolftc/include/info.h	2008-07-05 19:33:20 UTC (rev 5812)
@@ -4,6 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2008 Jaakko Keränen <jaakko.keranen@...>
+ *\author Copyright © 2005-2008 Daniel Swanson <danij@...>
  *\author Copyright © 2006 Martin Eyre <martineyre@...>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
 
@@ -6685,20 +6686,26 @@
     TXT_KILLMSG_STOMP,
     TXT_AMSTR_ROTATEON,
     TXT_AMSTR_ROTATEOFF,
-    TXT_WEAPON0,
     TXT_WEAPON1,
     TXT_WEAPON2,
-    TXT_WEAPON3,                    // 340
-    TXT_WEAPON4,
+    TXT_WEAPON3,
+    TXT_WEAPON4,                    // 340
     TXT_WEAPON5,
     TXT_WEAPON6,
     TXT_WEAPON7,
     TXT_WEAPON8,
+    TXT_WEAPON9,
     TXT_SKILL1,
     TXT_SKILL2,
     TXT_SKILL3,
     TXT_SKILL4,
     TXT_SKILL5,                     // 350
+    TXT_KEY1,
+    TXT_KEY2,
+    TXT_KEY3,
+    TXT_KEY4,
+    TXT_KEY5,
+    TXT_KEY6,
     NUMTEXT
 } textenum_t;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5827
          http://deng.svn.sourceforge.net/deng/?rev=5827&view=rev
Author:   danij
Date:     2008-07-08 14:00:46 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
Replaced jHexen's terraintype stuff with new common, GPL code. I took the opportunity to redesign completely to allow them to work with any type of material (was just flats) and to reduce their memory requirement.
Removed the game-side interpolation of scrolling plane materials in jHexen (as this was interfering with the interpolation that is now done engine-side).

Modified Paths:
--------------
    trunk/doomsday/plugins/common/src/p_map.c
    trunk/doomsday/plugins/common/src/p_mapspec.c
    trunk/doomsday/plugins/common/src/p_saveg.c
    trunk/doomsday/plugins/common/src/p_start.c
    trunk/doomsday/plugins/common/src/p_user.c
    trunk/doomsday/plugins/common/src/p_xgline.c
    trunk/doomsday/plugins/common/src/p_xgsec.c
    trunk/doomsday/plugins/jdoom/include/p_local.h
    trunk/doomsday/plugins/jdoom/include/p_mobj.h
    trunk/doomsday/plugins/jdoom/include/p_spec.h
    trunk/doomsday/plugins/jdoom/src/p_mobj.c
    trunk/doomsday/plugins/jdoom/src/p_spec.c
    trunk/doomsday/plugins/jdoom/src/p_telept.c
    trunk/doomsday/plugins/jdoom64/include/p_mobj.h
    trunk/doomsday/plugins/jdoom64/include/p_spec.h
    trunk/doomsday/plugins/jdoom64/src/p_mobj.c
    trunk/doomsday/plugins/jdoom64/src/p_spec.c
    trunk/doomsday/plugins/jdoom64/src/p_telept.c
    trunk/doomsday/plugins/jheretic/include/p_local.h
    trunk/doomsday/plugins/jheretic/include/p_mobj.h
    trunk/doomsday/plugins/jheretic/include/p_spec.h
    trunk/doomsday/plugins/jheretic/src/p_mobj.c
    trunk/doomsday/plugins/jheretic/src/p_pspr.c
    trunk/doomsday/plugins/jheretic/src/p_spec.c
    trunk/doomsday/plugins/jheretic/src/p_telept.c
    trunk/doomsday/plugins/jhexen/include/p_local.h
    trunk/doomsday/plugins/jhexen/include/p_mobj.h
    trunk/doomsday/plugins/jhexen/include/p_spec.h
    trunk/doomsday/plugins/jhexen/src/hrefresh.c
    trunk/doomsday/plugins/jhexen/src/p_enemy.c
    trunk/doomsday/plugins/jhexen/src/p_mobj.c
    trunk/doomsday/plugins/jhexen/src/p_spec.c
    trunk/doomsday/plugins/jhexen/src/p_telept.c
    trunk/doomsday/plugins/wolftc/include/p_local.h
    trunk/doomsday/plugins/wolftc/include/p_mobj.h
    trunk/doomsday/plugins/wolftc/include/p_spec.h
    trunk/doomsday/plugins/wolftc/src/p_mobj.c
    trunk/doomsday/plugins/wolftc/src/p_spec.c
    trunk/doomsday/plugins/wolftc/src/p_telept.c

Added Paths:
-----------
    trunk/doomsday/plugins/common/include/p_terraintype.h
    trunk/doomsday/plugins/common/src/p_terraintype.c

Added: trunk/doomsday/plugins/common/include/p_terraintype.h
===================================================================
--- trunk/doomsday/plugins/common/include/p_terraintype.h	                        (rev 0)
+++ trunk/doomsday/plugins/common/include/p_terraintype.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -0,0 +1,58 @@
+/**\file
+ *\section License
+ * License: GPL
+ * Online License Link: http://www.gnu.org/licenses/gpl.html
+ *
+ *\author Copyright © 2008 Daniel Swanson <danij@...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+/**
+ * p_terraintype.h:
+ */
+
+#ifndef __COMMON_TERRAINTYPE_H__
+#define __COMMON_TERRAINTYPE_H__
+
+#define TTF_NONSOLID        0x1 /* Various implications:
+                                   1) Bouncing mobjs destroyed on contact.
+                                   2) Able mobjs can dive/surface. */
+#define TTF_FLOORCLIP       0x2 // Mobjs contacting this terrain will sink into it.
+#define TTF_FRICTION_LOW    0x4
+#define TTF_FRICTION_HIGH   0x8
+
+// Mobjs contacting this cause various fx to be spawned:
+#if __JHERETIC__ || __JHEXEN__
+#define TTF_SPAWN_SPLASHES  0x10
+#define TTF_SPAWN_SMOKE     0x20
+#define TTF_SPAWN_SLUDGE    0x40
+#endif
+
+#if __JHEXEN__
+#define TTF_DAMAGING        0x80
+#endif
+
+typedef struct terraindef_s {
+    char*           name; // Symbolic name for this terrain.
+    short           flags; // TTF_* terrain type flags.
+} terraintype_t;
+
+void            P_InitTerrainTypes(void);
+const terraintype_t* P_TerrainTypeForMaterial(materialnum_t num);
+const terraintype_t* P_GetPlaneMaterialType(sector_t* sec, int plane);
+
+#endif

Modified: trunk/doomsday/plugins/common/src/p_map.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_map.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/common/src/p_map.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -64,6 +64,7 @@
 #include "g_common.h"
 #include "dmu_lib.h"
 #include "p_mapspec.h"
+#include "p_terraintype.h"
 #include "p_tick.h"
 #include "p_actor.h"
 
@@ -1369,9 +1370,6 @@
 #if __JDOOM__ || __JDOOM64__ || __JHERETIC__ || __WOLFTC__
     thing->dropOffZ = tmDropoffZ; // $dropoff_fix: keep track of dropoffs.
 #endif
-#if __JHEXEN__
-    thing->floorMaterial = tmFloorMaterial;
-#endif
 
     thing->pos[VX] = x;
     thing->pos[VY] = y;
@@ -1380,15 +1378,17 @@
 
     if(thing->flags2 & MF2_FLOORCLIP)
     {
-        if(thing->pos[VZ] == P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT) &&
-           P_MobjGetFloorTerrainType(thing) >= FLOOR_LIQUID)
+        thing->floorClip = 0;
+
+        if(thing->pos[VZ] == P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT))
         {
-            thing->floorClip = 10;
+            const terraintype_t* tt = P_MobjGetFloorTerrainType(thing);
+
+            if(tt->flags & TTF_FLOORCLIP)
+            {
+                thing->floorClip = 10;
+            }
         }
-        else
-        {
-            thing->floorClip = 0;
-        }
     }
 
     // If any special lines were hit, do the effect.
@@ -2216,10 +2216,6 @@
     thing->dropOffZ = tmDropoffZ; // $dropoff_fix: remember dropoffs.
 #endif
 
-#if __JHEXEN__
-    thing->floorMaterial = tmFloorMaterial;
-#endif
-
     if(onfloor)
     {
 #if __JHEXEN__

Modified: trunk/doomsday/plugins/common/src/p_mapspec.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_mapspec.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/common/src/p_mapspec.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -48,6 +48,7 @@
 #include "dmu_lib.h"
 #include "p_mapsetup.h"
 #include "p_mapspec.h"
+#include "p_terraintype.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -697,3 +698,17 @@
     params.soundTarget = soundTarget;
     P_Iteratep(sec, DMU_LINEDEF, &params, spreadSoundToNeighbors);
 }
+
+/**
+ * Returns the material type of the specified sector, plane.
+ *
+ * @param sec           The sector to check.
+ * @param plane         The plane id to check.
+ */
+const terraintype_t* P_GetPlaneMaterialType(sector_t* sec, int plane)
+{
+    materialnum_t       num =
+        P_GetIntp(sec, (plane? DMU_CEILING_MATERIAL : DMU_FLOOR_MATERIAL));
+
+    return P_TerrainTypeForMaterial(num);
+}

Modified: trunk/doomsday/plugins/common/src/p_saveg.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_saveg.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/common/src/p_saveg.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -1371,7 +1371,7 @@
     // 4: Added long 'tracer'
     // 4: Added long 'lastenemy'
     // 5: Added flags3
-    // 6: Floor material saved as archivenum
+    // 6: Floor material removed.
     //
     // JDOOM || JHERETIC || WOLFTC || JDOOM64
     // 4: Added byte 'translucency'
@@ -1409,9 +1409,7 @@
     SV_WriteLong(mo->sprite); // Used to find patch_t and flip value.
     SV_WriteLong(mo->frame);
 
-# if __JHEXEN__
-    SV_WriteLong(SV_MaterialArchiveNum(mo->floorMaterial));
-#else
+#if !__JHEXEN__
     // The closest interval over all contacted Sectors.
     SV_WriteLong(FLT2FIX(mo->floorZ));
     SV_WriteLong(FLT2FIX(mo->ceilingZ));
@@ -1742,11 +1740,8 @@
         mo->frame &= FF_FRAMEMASK; // not used anymore.
 
 #if __JHEXEN__
-    if(ver >= 6)
-        mo->floorMaterial = SV_GetArchiveMaterial(SV_ReadLong());
-    else
-        mo->floorMaterial =
-            R_MaterialNumForName(W_LumpName(SV_ReadLong()), MAT_FLAT);
+    if(ver < 6)
+        SV_ReadLong(); // Used to be floorflat.
 #else
     // The closest interval over all contacted Sectors.
     mo->floorZ = FIX2FLT(SV_ReadLong());

Modified: trunk/doomsday/plugins/common/src/p_start.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_start.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/common/src/p_start.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -56,6 +56,7 @@
 #include "p_user.h"
 #include "d_net.h"
 #include "p_map.h"
+#include "p_terraintype.h"
 #include "g_common.h"
 #include "p_start.h"
 #include "p_actor.h"

Added: trunk/doomsday/plugins/common/src/p_terraintype.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_terraintype.c	                        (rev 0)
+++ trunk/doomsday/plugins/common/src/p_terraintype.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -0,0 +1,237 @@
+/**\file
+ *\section License
+ * License: GPL
+ * Online License Link: http://www.gnu.org/licenses/gpl.html
+ *
+ *\author Copyright © 2008 Daniel Swanson <danij@...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+/**
+ * p_terraintype.c:
+ */
+
+// HEADER FILES ------------------------------------------------------------
+
+#include <string.h>
+
+#if __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
+#  include "jdoom.h"
+#elif __JDOOM64__
+#  include "jdoom64.h"
+#elif __JHERETIC__
+#  include "jheretic.h"
+#elif __JHEXEN__
+#  include "jhexen.h"
+#elif __JSTRIFE__
+#  include "jstrife.h"
+#endif
+
+#include "dmu_lib.h"
+#include "p_terraintype.h"
+
+// MACROS ------------------------------------------------------------------
+
+// TYPES -------------------------------------------------------------------
+
+typedef struct {
+    materialnum_t   materialNum;
+    uint            terrainNum;
+} materialterraintype_t;
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static terraintype_t terrainTypes[] =
+{
+    {"Default", 0}, // Default type (no special attributes).
+#if __JDOOM__ || __JDOOM64__ || __WOLFTC__
+    {"Water",   TTF_NONSOLID|TTF_FLOORCLIP},
+    {"Lava",    TTF_NONSOLID|TTF_FLOORCLIP},
+    {"Blood",   TTF_NONSOLID|TTF_FLOORCLIP},
+    {"Nukage",  TTF_NONSOLID|TTF_FLOORCLIP},
+    {"Slime",   TTF_NONSOLID|TTF_FLOORCLIP},
+#endif
+#if __JHERETIC__
+    {"Water",   TTF_NONSOLID|TTF_FLOORCLIP|TTF_SPAWN_SPLASHES},
+    {"Lava",    TTF_NONSOLID|TTF_FLOORCLIP|TTF_SPAWN_SMOKE},
+    {"Sludge",  TTF_NONSOLID|TTF_FLOORCLIP|TTF_SPAWN_SLUDGE},
+#endif
+#if __JHEXEN__
+    {"Water",   TTF_NONSOLID|TTF_FLOORCLIP|TTF_SPAWN_SPLASHES},
+    {"Lava",    TTF_NONSOLID|TTF_FLOORCLIP|TTF_FRICTION_HIGH|TTF_DAMAGING|TTF_SPAWN_SMOKE},
+    {"Sludge",  TTF_NONSOLID|TTF_FLOORCLIP|TTF_SPAWN_SLUDGE},
+    {"Ice",     TTF_FRICTION_LOW},
+#endif
+    {NULL, 0}
+};
+
+static materialterraintype_t* materialTTypes = NULL;
+static uint numMaterialTTypes = 0;
+
+// CODE --------------------------------------------------------------------
+
+static void createMaterialTerrainType(materialnum_t num, uint idx)
+{
+    uint                i;
+    materialterraintype_t* mtt;
+
+    // If we've already assigned this material to a terrain type, override
+    // the previous assignation.
+    for(i = 0; i < numMaterialTTypes; ++i)
+        if(materialTTypes[i].materialNum == num)
+        {
+            materialTTypes[i].terrainNum = idx;
+            return;
+        }
+
+    // Its a new material.
+    materialTTypes =
+        Z_Realloc(materialTTypes, sizeof(*materialTTypes) * ++numMaterialTTypes,
+                  PU_STATIC);
+
+    mtt = &materialTTypes[numMaterialTTypes-1];
+
+    mtt->materialNum = num;
+    mtt->terrainNum = idx - 1;
+}
+
+/**
+ * @param name          The symbolic terrain type name.
+ */
+static uint getTerrainTypeNumForName(const char* name)
+{
+    uint                i;
+
+    if(name && name[0])
+    {
+        for(i = 0; terrainTypes[i].name; ++i)
+        {
+            terraintype_t*      tt = &terrainTypes[i];
+
+            if(!stricmp(tt->name, name))
+                return i + 1; // 1-based index.
+        }
+    }
+
+    return 0;
+}
+
+static terraintype_t* getTerrainTypeForMaterial(materialnum_t num)
+{
+    uint                i;
+
+    if(num)
+    {
+        for(i = 0; i < numMaterialTTypes; ++i)
+        {
+            materialterraintype_t* mtt = &materialTTypes[i];
+
+            if(mtt->materialNum == num)
+                return &terrainTypes[mtt->terrainNum];
+        }
+    }
+
+    return NULL;
+}
+
+/**
+ * Called during (re)init.
+ */
+void P_InitTerrainTypes(void)
+{
+    struct matttypedef_s {
+        const char*     matName;
+        materialtype_t  matType;
+        const char*     ttName;
+    } matTTypeDefs[] =
+    {
+#if __JDOOM__ || __JDOOM64__ || __WOLFTC__
+        {"FWATER1",  MAT_FLAT, "Water"},
+        {"LAVA1",    MAT_FLAT, "Lava"},
+        {"BLOOD1",   MAT_FLAT, "Blood"},
+        {"NUKAGE1",  MAT_FLAT, "Nukage"},
+        {"SLIME01",  MAT_FLAT, "Slime"},
+#endif
+#if __JHERETIC__
+        {"FLTWAWA1", MAT_FLAT, "Water"},
+        {"FLTFLWW1", MAT_FLAT, "Water"},
+        {"FLTLAVA1", MAT_FLAT, "Lava"},
+        {"FLATHUH1", MAT_FLAT, "Lava"},
+        {"FLTSLUD1", MAT_FLAT, "Sludge"},
+#endif
+#if __JHEXEN__
+        {"X_005",    MAT_FLAT, "Water"},
+        {"X_001",    MAT_FLAT, "Lava"},
+        {"X_009",    MAT_FLAT, "Sludge"},
+        {"F_033",    MAT_FLAT, "Ice"},
+#endif
+        {NULL, 0, NULL}
+    };
+    uint                i;
+
+    if(materialTTypes)
+        Z_Free(materialTTypes);
+    materialTTypes = NULL;
+    numMaterialTTypes = 0;
+
+    for(i = 0; matTTypeDefs[i].matName; ++i)
+    {
+        uint                idx =
+            getTerrainTypeNumForName(matTTypeDefs[i].ttName);
+
+        if(idx)
+        {
+            materialnum_t       num =
+                R_MaterialCheckNumForName(matTTypeDefs[i].matName,
+                                          matTTypeDefs[i].matType);
+            if(num)
+            {
+                Con_Message("P_InitTerrainTypes: Material '%s' linked to terrain type '%s'.\n",
+                            matTTypeDefs[i].matName, matTTypeDefs[i].ttName);
+                createMaterialTerrainType(num, idx);
+            }
+        }
+    }
+}
+
+/**
+ * Return the terrain type of the specified material.
+ *
+ * @param num           The material to check.
+ */
+const terraintype_t* P_TerrainTypeForMaterial(materialnum_t num)
+{
+    const terraintype_t* tt = getTerrainTypeForMaterial(num);
+
+    if(tt)
+        return tt; // Known, return it.
+
+    // Return the default type.
+    return &terrainTypes[0];
+}

Modified: trunk/doomsday/plugins/common/src/p_user.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_user.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/common/src/p_user.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -243,13 +243,10 @@
  */
 void P_Thrust(player_t *player, angle_t angle, float move)
 {
-    mobj_t     *plrmo = player->plr->mo;
-    uint        an = angle >> ANGLETOFINESHIFT;
-#if __JDOOM__ || __JDOOM64__ || __JHERETIC__
-    sector_t   *sector = P_GetPtrp(plrmo->subsector, DMU_SECTOR);
-#endif
+    mobj_t*             mo = player->plr->mo;
+    uint                an = angle >> ANGLETOFINESHIFT;
 
-    if(player->powers[PT_FLIGHT] && !(plrmo->pos[VZ] <= plrmo->floorZ))
+    if(player->powers[PT_FLIGHT] && !(mo->pos[VZ] <= mo->floorZ))
     {
         /*float xmul=1, ymul=1;
 
@@ -261,32 +258,44 @@
            mo->mom[MZ] += sin(ang) * move;
            } */
 
-        plrmo->mom[MX] += move * FIX2FLT(finecosine[an]);
-        plrmo->mom[MY] += move * FIX2FLT(finesine[an]);
+        mo->mom[MX] += move * FIX2FLT(finecosine[an]);
+        mo->mom[MY] += move * FIX2FLT(finesine[an]);
     }
+    else
+    {
+#if __JDOOM__ || __JDOOM64__ || __JHERETIC__
+        sector_t*           sec = P_GetPtrp(mo->subsector, DMU_SECTOR);
+        float               mul;
+#endif
+#if __JHEXEN__
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+#endif
+
 #if __JHERETIC__
-    else if(P_ToXSector(sector)->special == 15) // Friction_Low
-    {
-        plrmo->mom[MX] += (move / 4) * FIX2FLT(finecosine[an]);
-        plrmo->mom[MY] += (move / 4) * FIX2FLT(finesine[an]);
-    }
+        if(P_ToXSector(sec)->special == 15) // Friction_Low
+        {
+            mo->mom[MX] += (move / 4) * FIX2FLT(finecosine[an]);
+            mo->mom[MY] += (move / 4) * FIX2FLT(finesine[an]);
+            return;
+        }
+
 #elif __JHEXEN__
-    else if(P_MobjGetFloorTerrainType(plrmo) == FLOOR_ICE) // Friction_Low
-    {
-        plrmo->mom[MX] += (move / 2) * FIX2FLT(finecosine[an]);
-        plrmo->mom[MY] += (move / 2) * FIX2FLT(finesine[an]);
-    }
+        if(tt->flags & TTF_FRICTION_LOW)
+        {
+            mo->mom[MX] += (move / 2) * FIX2FLT(finecosine[an]);
+            mo->mom[MY] += (move / 2) * FIX2FLT(finesine[an]);
+            return;
+        }
 #endif
-    else
-    {
+
 #if __JDOOM__ || __JDOOM64__ || __JHERETIC__
-        float       mul = XS_ThrustMul(sector);
-
+        mul = XS_ThrustMul(sec);
         if(mul != 1)
             move *= mul;
 #endif
-        plrmo->mom[MX] += move * FIX2FLT(finecosine[an]);
-        plrmo->mom[MY] += move * FIX2FLT(finesine[an]);
+
+        mo->mom[MX] += move * FIX2FLT(finecosine[an]);
+        mo->mom[MY] += move * FIX2FLT(finesine[an]);
     }
 }
 
@@ -954,8 +963,10 @@
         DD_SetVariable(DD_CPLAYER_THRUST_MUL, &mul);
     }
     else
-    {   float               mul =
-            ((P_MobjGetFloorTerrainType(mo) == FLOOR_ICE) ? (1.0f / 2) : 1);
+    {   const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+        float               mul =
+            ((tt->flags & TTF_FRICTION_LOW) ? (1.0f / 2) : 1);
+
         DD_SetVariable(DD_CPLAYER_THRUST_MUL, &mul);
     }
 #else
@@ -1207,18 +1218,11 @@
 
 void P_PlayerThinkSpecial(player_t *player)
 {
-#if __JHEXEN__
-    int                 floorType;
-#endif
-
     if(P_ToXSector(P_GetPtrp(player->plr->mo->subsector, DMU_SECTOR))->special)
         P_PlayerInSpecialSector(player);
 
 #if __JHEXEN__
-    if((floorType = P_MobjGetFloorTerrainType(player->plr->mo)) != FLOOR_SOLID)
-    {
-        P_PlayerOnSpecialFloor(player, floorType);
-    }
+    P_PlayerOnSpecialFloor(player);
 #endif
 }
 

Modified: trunk/doomsday/plugins/common/src/p_xgline.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_xgline.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/common/src/p_xgline.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -70,6 +70,7 @@
 #include "p_player.h"
 #include "p_map.h"
 #include "p_mapspec.h"
+#include "p_terraintype.h"
 #include "p_tick.h"
 
 // MACROS ------------------------------------------------------------------
@@ -1671,16 +1672,17 @@
     // Feet clipped?
     if(mobj->flags2 & MF2_FLOORCLIP)
     {
-        if(P_MobjGetFloorTerrainType(mobj) >= FLOOR_LIQUID &&
-           mobj->pos[VZ] ==
-           P_GetFloatp(mobj->subsector, DMU_FLOOR_HEIGHT))
+        mobj->floorClip = 0;
+
+        if(mobj->pos[VZ] == P_GetFloatp(mobj->subsector, DMU_FLOOR_HEIGHT))
         {
-            mobj->floorClip = 10;
+            const terraintype_t* tt = P_MobjGetFloorTerrainType(mobj);
+
+            if(tt->flags & TTF_FLOORCLIP)
+            {
+                mobj->floorClip = 10;
+            }
         }
-        else
-        {
-            mobj->floorClip = 0;
-        }
     }
 
     // Spawn flash at the new position?

Modified: trunk/doomsday/plugins/common/src/p_xgsec.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_xgsec.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/common/src/p_xgsec.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -64,6 +64,7 @@
 #include "g_common.h"
 #include "p_map.h"
 #include "p_mapspec.h"
+#include "p_terraintype.h"
 #include "p_tick.h"
 
 // MACROS ------------------------------------------------------------------
@@ -2304,16 +2305,18 @@
         // Have we teleported from/to a sector with a non-solid floor?
         if(thing->flags2 & MF2_FLOORCLIP)
         {
+            thing->floorClip = 0;
+
             if(thing->pos[VZ] ==
-               P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT) &&
-               P_MobjGetFloorTerrainType(thing) >= FLOOR_LIQUID)
+               P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT))
             {
-                thing->floorClip = 10;
+                const terraintype_t* tt = P_MobjGetFloorTerrainType(thing);
+
+                if(tt->flags & TTF_FLOORCLIP)
+                {
+                    thing->floorClip = 10;
+                }
             }
-            else
-            {
-                thing->floorClip = 0;
-            }
         }
 
         if(thing->flags & MF_MISSILE)

Modified: trunk/doomsday/plugins/jdoom/include/p_local.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/p_local.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom/include/p_local.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -38,6 +38,7 @@
 #include "p_start.h"
 #include "p_actor.h"
 #include "p_xg.h"
+#include "p_terraintype.h"
 
 // Palette indices.
 // For damage/bonus red-/gold-shifts
@@ -101,7 +102,6 @@
 void        P_MobjRemove(mobj_t* mo, boolean noRespawn);
 boolean     P_MobjChangeState(mobj_t* mo, statenum_t state);
 void        P_MobjThinker(mobj_t* mo);
-int         P_MobjGetFloorTerrainType(mobj_t* mo);
 void        P_RipperBlood(mobj_t* mo);
 
 void        P_SetDoomsdayFlags(mobj_t* mo);

Modified: trunk/doomsday/plugins/jdoom/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/p_mobj.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom/include/p_mobj.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -35,6 +35,7 @@
 #endif
 
 #include "d_think.h"
+#include "p_terraintype.h"
 #include "doomdata.h"
 #include "info.h"
 #include "tables.h"
@@ -250,6 +251,7 @@
                          angle_t angle);
 mobj_t*     P_SpawnTeleFog(float x, float y, angle_t angle);
 
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo);
 float       P_MobjGetFriction(mobj_t *mo);
 
 #endif

Modified: trunk/doomsday/plugins/jdoom/include/p_spec.h
===================================================================
--- trunk/doomsday/plugins/jdoom/include/p_spec.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom/include/p_spec.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -42,22 +42,6 @@
 
 #include "d_player.h"
 
-// Any floor type >= FLOOR_LIQUID will floorclip sprites
-typedef enum {
-    FLOOR_SOLID,
-    FLOOR_LIQUID,
-    FLOOR_WATER,
-    FLOOR_LAVA,
-    FLOOR_SLUDGE,
-    FLOOR_BLOOD,
-    FLOOR_SLIME,
-    NUM_TERRAIN_TYPES
-} terraintype_t;
-
-void            P_InitTerrainTypes(void);
-int             P_GetTerrainType(sector_t* sec, int plane);
-int             P_GetTerrainTypeForMaterial(materialnum_t num);
-
 // End-level timer (-TIMER option)
 extern boolean  levelTimer;
 extern int      levelTimeCount;

Modified: trunk/doomsday/plugins/jdoom/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_mobj.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom/src/p_mobj.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -42,6 +42,7 @@
 #include "hu_stuff.h"
 #include "g_common.h"
 #include "p_map.h"
+#include "p_terraintype.h"
 #include "p_player.h"
 #include "p_tick.h"
 #include "dmu_lib.h"
@@ -78,12 +79,19 @@
 
 // CODE --------------------------------------------------------------------
 
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo)
+{
+    sector_t*           sec = P_GetPtrp(mo->subsector, DMU_SECTOR);
+
+    return P_GetPlaneMaterialType(sec, PLN_FLOOR);
+}
+
 /**
  * @return              @c true, if the mobj is still present.
  */
-boolean P_MobjChangeState(mobj_t *mobj, statenum_t state)
+boolean P_MobjChangeState(mobj_t* mobj, statenum_t state)
 {
-    state_t            *st;
+    state_t*            st;
 
     do
     {
@@ -383,11 +391,6 @@
     th->tics += P_Random() & 3;
 }
 
-int P_MobjGetFloorTerrainType(mobj_t *thing)
-{
-    return P_GetTerrainType(P_GetPtrp(thing->subsector, DMU_SECTOR), PLN_FLOOR);
-}
-
 void P_HitFloor(mobj_t *mo)
 {
     //P_MobjSectorsIterator(mo, PIT_Splash, mo);
@@ -880,16 +883,17 @@
         }
     }
 
+    mo->floorClip = 0;
     if((mo->flags2 & MF2_FLOORCLIP) &&
-       P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID &&
        mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
     {
-        mo->floorClip = 10;
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+        if(tt->flags & TTF_FLOORCLIP)
+        {
+            mo->floorClip = 10;
+        }
     }
-    else
-    {
-        mo->floorClip = 0;
-    }
 
     return mo;
 }
@@ -963,16 +967,17 @@
 
     mo = P_SpawnMobj3fv(i, pos, sobj->angle);
 
+    mo->floorClip = 0;
     if((mo->flags2 & MF2_FLOORCLIP) &&
-       P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID &&
        mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
     {
-        mo->floorClip = 10;
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+        if(tt->flags & TTF_FLOORCLIP)
+        {
+            mo->floorClip = 10;
+        }
     }
-    else
-    {
-        mo->floorClip = 0;
-    }
 
     // Copy spawn attributes to the new mobj.
     memcpy(&mo->spawnSpot, sobj, sizeof(mo->spawnSpot));

Modified: trunk/doomsday/plugins/jdoom/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_spec.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom/src/p_spec.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -86,80 +86,11 @@
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-//// \bug From jHeretic, replace!
-int *TerrainTypes;
-struct terraindef_s {
-    char   *name;
-    int     type;
-} TerrainTypeDefs[] =
-{
-    {"FWATER1", FLOOR_WATER},
-    {"LAVA1",   FLOOR_LAVA},
-    {"BLOOD1",  FLOOR_BLOOD},
-    {"NUKAGE1", FLOOR_SLIME},
-    {"SLIME01", FLOOR_SLUDGE},
-    {"END",     -1}
-};
-
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
 // CODE --------------------------------------------------------------------
 
 /**
- * \bug This routine originated from jHeretic, we need to rewrite it!
- */
-void P_InitTerrainTypes(void)
-{
-    int                 i, size;
-    materialnum_t       num;
-
-    size = Get(DD_NUMLUMPS) * sizeof(int);
-    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
-    memset(TerrainTypes, 0, size);
-    for(i = 0; TerrainTypeDefs[i].type != -1; ++i)
-    {
-        num = R_MaterialCheckNumForName(TerrainTypeDefs[i].name, MAT_FLAT);
-        if(num != 0)
-        {
-            TerrainTypes[num] = TerrainTypeDefs[i].type;
-        }
-    }
-}
-
-/**
- * Look up the terrain type for the specified material.
- *
- * @param num           The material number to check.
- *
- * @return              Terrain type of the material if known,
- *                      else @c FLOOR_SOLID.
- */
-int P_GetTerrainTypeForMaterial(materialnum_t num)
-{
-    if(num)
-        return TerrainTypes[num];
-    else
-        return FLOOR_SOLID;
-}
-
-/**
- * Returns the terrain type of the specified sector, plane.
- *
- * @param sec           The sector to check.
- * @param plane         The plane id to check.
- */
-int P_GetTerrainType(sector_t* sec, int plane)
-{
-    materialnum_t       num =
-        P_GetIntp(sec, (plane? DMU_CEILING_MATERIAL : DMU_FLOOR_MATERIAL));
-
-    if(num)
-        return TerrainTypes[num];
-    else
-        return FLOOR_SOLID;
-}
-
-/**
  * From PrBoom:
  * Load the table of animation definitions, checking for existence of
  * the start and end of each frame. If the start doesn't exist the sequence

Modified: trunk/doomsday/plugins/jdoom/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_telept.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom/src/p_telept.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -35,6 +35,7 @@
 #include "p_mapsetup.h"
 #include "p_map.h"
 #include "p_mapspec.h"
+#include "p_terraintype.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -166,16 +167,17 @@
         mo->angle = dest->angle;
         if(mo->flags2 & MF2_FLOORCLIP)
         {
-            if(mo->pos[VZ] ==
-               P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT) &&
-               P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID)
+            mo->floorClip = 0;
+
+            if(mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
             {
-                mo->floorClip = 10;
+                const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+                if(tt->flags & TTF_FLOORCLIP)
+                {
+                    mo->floorClip = 10;
+                }
             }
-            else
-            {
-                mo->floorClip = 0;
-            }
         }
 
         mo->mom[MX] = mo->mom[MY] = mo->mom[MZ] = 0;

Modified: trunk/doomsday/plugins/jdoom64/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/p_mobj.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom64/include/p_mobj.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -38,7 +38,7 @@
 // Basics.
 #include "tables.h"
 
-// We need the thinker_t stuff.
+#include "p_terraintype.h"
 #include "d_think.h"
 #include "info.h"
 
@@ -370,7 +370,7 @@
 
 boolean     P_MobjChangeState(mobj_t* mo, statenum_t state);
 void        P_MobjThinker(mobj_t* mo);
-int         P_MobjGetFloorTerrainType(mobj_t* mo);
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo);
 void        P_RipperBlood(mobj_t* mo);
 void        P_SetDoomsdayFlags(mobj_t* mo);
 void        P_HitFloor(mobj_t* mo);

Modified: trunk/doomsday/plugins/jdoom64/include/p_spec.h
===================================================================
--- trunk/doomsday/plugins/jdoom64/include/p_spec.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom64/include/p_spec.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -43,22 +43,6 @@
 
 #include "d_player.h"
 
-// Any floor type >= FLOOR_LIQUID will floorclip mobjs.
-typedef enum {
-    FLOOR_SOLID,
-    FLOOR_LIQUID,
-    FLOOR_WATER,
-    FLOOR_LAVA,
-    FLOOR_SLUDGE,
-    FLOOR_BLOOD,
-    FLOOR_SLIME,
-    NUM_TERRAIN_TYPES
-} terraintype_t;
-
-void            P_InitTerrainTypes(void);
-terraintype_t   P_GetTerrainType(sector_t* sec, int plane);
-terraintype_t   P_MaterialToTerrainType(materialnum_t num);
-
 // Base plane ids.
 enum {
     PLN_FLOOR,

Modified: trunk/doomsday/plugins/jdoom64/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_mobj.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom64/src/p_mobj.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -46,6 +46,7 @@
 #include "hu_stuff.h"
 #include "g_common.h"
 #include "p_map.h"
+#include "p_terraintype.h"
 #include "p_player.h"
 #include "p_tick.h"
 #include "p_actor.h"
@@ -87,12 +88,19 @@
 
 // CODE --------------------------------------------------------------------
 
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo)
+{
+    sector_t*           sec = P_GetPtrp(mo->subsector, DMU_SECTOR);
+
+    return P_GetPlaneMaterialType(sec, PLN_FLOOR);
+}
+
 /**
  * @return              @c true, if the mobj is still present.
  */
-boolean P_MobjChangeState(mobj_t *mobj, statenum_t state)
+boolean P_MobjChangeState(mobj_t* mobj, statenum_t state)
 {
-    state_t            *st;
+    state_t*            st;
 
     do
     {
@@ -383,11 +391,6 @@
     th->tics += P_Random() & 3;
 }
 
-int P_MobjGetFloorTerrainType(mobj_t *thing)
-{
-    return P_GetTerrainType(P_GetPtrp(thing->subsector, DMU_SECTOR), PLN_FLOOR);
-}
-
 void P_HitFloor(mobj_t *mo)
 {
     //P_MobjSectorsIterator(mo, PIT_Splash, mo);
@@ -955,16 +958,18 @@
         }
     }
 
+    mo->floorClip = 0;
+
     if((mo->flags2 & MF2_FLOORCLIP) &&
-       P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID &&
        mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
     {
-        mo->floorClip = 10;
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+        if(tt->flags & TTF_FLOORCLIP)
+        {
+            mo->floorClip = 10;
+        }
     }
-    else
-    {
-        mo->floorClip = 0;
-    }
 
     return mo;
 }
@@ -1046,17 +1051,18 @@
     if(sobj->flags & MTF_RESPAWN) // jd64 (no test originally)
     {
         mo = P_SpawnMobj3fv(i, pos, sobj->angle);
+        mo->floorClip = 0;
 
         if(mo->flags2 & MF2_FLOORCLIP &&
-           P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID &&
            mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
         {
-            mo->floorClip = 10;
+            const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+            if(tt->flags & TTF_FLOORCLIP)
+            {
+                mo->floorClip = 10;
+            }
         }
-        else
-        {
-            mo->floorClip = 0;
-        }
 
         // Copy spawn attributes to the new mobj.
         memcpy(&mo->spawnSpot, sobj, sizeof(mo->spawnSpot));

Modified: trunk/doomsday/plugins/jdoom64/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_spec.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom64/src/p_spec.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -90,80 +90,11 @@
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-//// \todo From jHeretic, replace!
-int    *TerrainTypes;
-struct terraindef_s {
-    char   *name;
-    int     type;
-} TerrainTypeDefs[] =
-{
-    {"FWATER1", FLOOR_WATER},
-    {"LAVA1",   FLOOR_LAVA},
-    {"BLOOD1",  FLOOR_BLOOD},
-    {"NUKAGE1", FLOOR_SLIME},
-    {"SLIME01", FLOOR_SLUDGE},
-    {"END",     -1}
-};
-
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
 // CODE --------------------------------------------------------------------
 
 /**
- * \bug This routine originated from jHeretic, we need to rewrite it!
- */
-void P_InitTerrainTypes(void)
-{
-    int                 i, size;
-    materialnum_t       num;
-
-    size = Get(DD_NUMLUMPS) * sizeof(int);
-    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
-    memset(TerrainTypes, 0, size);
-    for(i = 0; TerrainTypeDefs[i].type != -1; ++i)
-    {
-        num = R_MaterialCheckNumForName(TerrainTypeDefs[i].name, MAT_FLAT);
-        if(num != 0)
-        {
-            TerrainTypes[num] = TerrainTypeDefs[i].type;
-        }
-    }
-}
-
-/**
- * Look up the terrain type for the specified material.
- *
- * @param num           The material number to check.
- *
- * @return              Terrain type of the material if known,
- *                      else @c FLOOR_SOLID.
- */
-int P_GetTerrainTypeForMaterial(materialnum_t num)
-{
-    if(num)
-        return TerrainTypes[num];
-    else
-        return FLOOR_SOLID;
-}
-
-/**
- * Returns the terrain type of the specified sector, plane.
- *
- * @param sec           The sector to check.
- * @param plane         The plane id to check.
- */
-int P_GetTerrainType(sector_t* sec, int plane)
-{
-    materialnum_t       num =
-        P_GetIntp(sec, (plane? DMU_CEILING_MATERIAL : DMU_FLOOR_MATERIAL));
-
-    if(num)
-        return TerrainTypes[num];
-    else
-        return FLOOR_SOLID;
-}
-
-/**
  * From PrBoom:
  * Load the table of animation definitions, checking for existence of
  * the start and end of each frame. If the start doesn't exist the sequence

Modified: trunk/doomsday/plugins/jdoom64/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_telept.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jdoom64/src/p_telept.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -39,6 +39,7 @@
 #include "p_mapsetup.h"
 #include "p_map.h"
 #include "p_mapspec.h"
+#include "p_terraintype.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -167,16 +168,17 @@
         mo->angle = dest->angle;
         if(mo->flags2 & MF2_FLOORCLIP)
         {
-            if(mo->pos[VZ] ==
-                P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT) &&
-               P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID)
+            mo->floorClip = 0;
+
+            if(mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
             {
-                mo->floorClip = 10;
+                const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+                if(tt->flags & TTF_FLOORCLIP)
+                {
+                    mo->floorClip = 10;
+                }
             }
-            else
-            {
-                mo->floorClip = 0;
-            }
         }
 
         mo->mom[MX] = mo->mom[MY] = mo->mom[MZ] = 0;

Modified: trunk/doomsday/plugins/jheretic/include/p_local.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/p_local.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jheretic/include/p_local.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -160,8 +160,7 @@
 void        P_BlasterMobjThinker(mobj_t *mobj);
 void        P_SpawnBloodSplatter(float x, float y, float z, mobj_t *originator);
 void        P_RipperBlood(mobj_t *mo);
-int         P_MobjGetFloorTerrainType(mobj_t *thing);
-int         P_HitFloor(mobj_t *thing);
+boolean     P_HitFloor(mobj_t *thing);
 boolean     P_CheckMissileSpawn(mobj_t *missile);
 void        P_MobjMoveZ(mobj_t *mo);
 void        P_ExplodeMissile(mobj_t *mo);

Modified: trunk/doomsday/plugins/jheretic/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/p_mobj.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jheretic/include/p_mobj.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -34,6 +34,7 @@
 #  error "Using jHeretic headers without __JHERETIC__"
 #endif
 
+#include "p_terraintype.h"
 #include "h_think.h"
 #include "info.h"
 
@@ -250,6 +251,7 @@
                                 angle_t angle, float momz);
 mobj_t*     P_SpawnTeleFog(float x, float y, angle_t angle);
 
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t *thing);
 float       P_MobjGetFriction(mobj_t *mo);
 
 #endif

Modified: trunk/doomsday/plugins/jheretic/include/p_spec.h
===================================================================
--- trunk/doomsday/plugins/jheretic/include/p_spec.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jheretic/include/p_spec.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -47,22 +47,6 @@
 #include "h_player.h"
 #include "r_data.h"
 
-// Any floor type >= FLOOR_LIQUID will floorclip sprites
-typedef enum {
-    FLOOR_SOLID,
-    FLOOR_LIQUID,
-    FLOOR_WATER,
-    FLOOR_LAVA,
-    FLOOR_SLUDGE,
-    NUM_TERRAIN_TYPES
-} terraintype_t;
-
-extern terraintype_t* TerrainTypes;
-
-void            P_InitTerrainTypes(void);
-terraintype_t   P_GetTerrainType(sector_t* sec, int plane);
-terraintype_t   P_GetTerrainTypeForMaterial(materialnum_t num);
-
 //      Define values for map objects
 #define MO_TELEPORTMAN          14
 

Modified: trunk/doomsday/plugins/jheretic/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_mobj.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jheretic/src/p_mobj.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -55,6 +55,7 @@
 #include "hu_stuff.h"
 #include "g_common.h"
 #include "p_map.h"
+#include "p_terraintype.h"
 #include "p_player.h"
 #include "p_tick.h"
 
@@ -92,12 +93,19 @@
 
 // CODE --------------------------------------------------------------------
 
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo)
+{
+    sector_t*           sec = P_GetPtrp(mo->subsector, DMU_SECTOR);
+
+    return P_GetPlaneMaterialType(sec, PLN_FLOOR);
+}
+
 /**
  * @return              @c true, if the mobj is still present.
  */
-boolean P_MobjChangeState(mobj_t *mobj, statenum_t state)
+boolean P_MobjChangeState(mobj_t* mobj, statenum_t state)
 {
-    state_t            *st;
+    state_t*            st;
 
     if(state == S_NULL)
     {   // Remove mobj.
@@ -1113,21 +1121,23 @@
         }
     }
 
+    mo->floorClip = 0;
+
     if((mo->flags2 & MF2_FLOORCLIP) &&
-       P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID &&
        mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
     {
-        mo->floorClip = 10;
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+        if(tt->flags & TTF_FLOORCLIP)
+        {
+            mo->floorClip = 10;
+        }
     }
-    else
-    {
-        mo->floorClip = 0;
-    }
 
     return mo;
 }
 
-mobj_t *P_SpawnMobj3fv(mobjtype_t type, float pos[3], angle_t angle)
+mobj_t* P_SpawnMobj3fv(mobjtype_t type, float pos[3], angle_t angle)
 {
     return P_SpawnMobj3f(type, pos[VX], pos[VY], pos[VZ], angle);
 }
@@ -1135,9 +1145,9 @@
 /**
  * Queue up a spawn from the specified spot.
  */
-void P_RespawnEnqueue(spawnspot_t *spot)
+void P_RespawnEnqueue(spawnspot_t* spot)
 {
-    spawnspot_t        *spawnObj = &itemRespawnQueue[itemRespawnQueueHead];
+    spawnspot_t*        spawnObj = &itemRespawnQueue[itemRespawnQueueHead];
 
     memcpy(spawnObj, spot, sizeof(*spawnObj));
 
@@ -1497,21 +1507,20 @@
     th->tics += P_Random() & 3;
 }
 
-int P_MobjGetFloorTerrainType(mobj_t *thing)
-{
-    return P_GetTerrainType(P_GetPtrp(thing->subsector, DMU_SECTOR), PLN_FLOOR);
-}
-
 #define SMALLSPLASHCLIP 12;
 
-int P_HitFloor(mobj_t *thing)
+/**
+ * @return              @c true, if mobj contacted a non-solid floor.
+ */
+boolean P_HitFloor(mobj_t* thing)
 {
-    mobj_t             *mo;
+    mobj_t*             mo;
+    const terraintype_t* tt;
 
     if(thing->floorZ != P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT))
     {
         // Don't splash if landing on the edge above water/lava/etc....
-        return FLOOR_SOLID;
+        return false;
     }
 
     // Things that don't splash go here.
@@ -1520,17 +1529,17 @@
     case MT_LAVASMOKE:
     case MT_SPLASH:
     case MT_SLUDGECHUNK:
-        return FLOOR_SOLID;
+        return false;
 
     default:
         if(P_IsCamera(thing))
-            return FLOOR_SOLID;
+            return false;
         break;
     }
 
-    switch(P_MobjGetFloorTerrainType(thing))
+    tt = P_MobjGetFloorTerrainType(thing);
+    if(tt->flags & TTF_SPAWN_SPLASHES)
     {
-    case FLOOR_WATER:
         mo = P_SpawnMobj3f(MT_SPLASHBASE, thing->pos[VX], thing->pos[VY],
                            ONFLOORZ, thing->angle + ANG180);
         if(mo)
@@ -1545,10 +1554,12 @@
             mo->mom[MY] = FIX2FLT((P_Random() - P_Random()) << 8);
             mo->mom[MZ] = 2 + FIX2FLT(P_Random() << 8);
         }
+
         S_StartSound(SFX_GLOOP, mo);
-        return FLOOR_WATER;
-
-    case FLOOR_LAVA:
+        return true;
+    }
+    else if(tt->flags & TTF_SPAWN_SMOKE)
+    {
         mo = P_SpawnMobj3f(MT_LAVASPLASH, thing->pos[VX], thing->pos[VY],
                            ONFLOORZ, thing->angle + ANG180);
         if(mo)
@@ -1561,10 +1572,11 @@
             mo->mom[MZ] = 1 + FIX2FLT((P_Random() << 7));
         }
         S_StartSound(SFX_BURN, mo);
-        return FLOOR_LAVA;
-
-    case FLOOR_SLUDGE:
-        mo = P_SpawnMobj3f(MT_SLUDGESPLASH, thing->pos[VX], thing->pos[VY],
+        return true;
+    }
+    else if(tt->flags & TTF_SPAWN_SLUDGE)
+    {
+       mo = P_SpawnMobj3f(MT_SLUDGESPLASH, thing->pos[VX], thing->pos[VY],
                            ONFLOORZ, thing->angle + ANG180);
         if(mo)
             mo->floorClip += SMALLSPLASHCLIP;
@@ -1578,10 +1590,10 @@
             mo->mom[MY] = FIX2FLT((P_Random() - P_Random()) << 8);
             mo->mom[MZ] = 1 + FIX2FLT(P_Random() << 8);
         }
-        return FLOOR_SLUDGE;
+        return true;
     }
 
-    return FLOOR_SOLID;
+    return false;
 }
 
 /**

Modified: trunk/doomsday/plugins/jheretic/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_pspr.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jheretic/src/p_pspr.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -61,6 +61,7 @@
 #include "p_player.h"
 #include "p_map.h"
 #include "p_tick.h"
+#include "p_terraintype.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -1389,7 +1390,7 @@
 
 void C_DECL A_MaceBallImpact(mobj_t *ball)
 {
-    if(ball->pos[VZ] <= ball->floorZ && P_HitFloor(ball) != FLOOR_SOLID)
+    if(ball->pos[VZ] <= ball->floorZ && P_HitFloor(ball))
     {   // Landed in some sort of liquid.
         P_MobjRemove(ball, true);
         return;
@@ -1417,7 +1418,7 @@
     mobj_t             *tiny;
     uint                an;
 
-    if(ball->pos[VZ] <= ball->floorZ && P_HitFloor(ball) != FLOOR_SOLID)
+    if(ball->pos[VZ] <= ball->floorZ && P_HitFloor(ball))
     {   // Landed in some sort of liquid.
         P_MobjRemove(ball, true);
         return;
@@ -1486,7 +1487,7 @@
     angle_t             angle;
     boolean             newAngle;
 
-    if(ball->pos[VZ] <= ball->floorZ && P_HitFloor(ball) != FLOOR_SOLID)
+    if(ball->pos[VZ] <= ball->floorZ && P_HitFloor(ball))
     {   // Landed in some sort of liquid.
         P_MobjRemove(ball, true);
         return;

Modified: trunk/doomsday/plugins/jheretic/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_spec.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jheretic/src/p_spec.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -1263,20 +1263,6 @@
     AmbSndSeq10                 // FastFootsteps
 };
 
-terraintype_t* TerrainTypes;
-struct terraindef_s {
-    char*           name;
-    terraintype_t   type;
-} TerrainTypeDefs[] =
-{
-    {"FLTWAWA1", FLOOR_WATER},
-    {"FLTFLWW1", FLOOR_WATER},
-    {"FLTLAVA1", FLOOR_LAVA},
-    {"FLATHUH1", FLOOR_LAVA},
-    {"FLTSLUD1", FLOOR_SLUDGE},
-    {"END", -1}
-};
-
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
 // CODE --------------------------------------------------------------------
@@ -1289,60 +1275,6 @@
 }
 
 /**
- * \bug This routine originated from jHeretic, we need to rewrite it!
- */
-void P_InitTerrainTypes(void)
-{
-    int                 i, size;
-    materialnum_t       num;
-
-    size = Get(DD_NUMLUMPS) * sizeof(int);
-    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
-    memset(TerrainTypes, 0, size);
-    for(i = 0; TerrainTypeDefs[i].type != -1; ++i)
-    {
-        num = R_MaterialCheckNumForName(TerrainTypeDefs[i].name, MAT_FLAT);
-        if(num != 0)
-        {
-            TerrainTypes[num] = TerrainTypeDefs[i].type;
-        }
-    }
-}
-
-/**
- * Look up the terrain type for the specified material.
- *
- * @param num           The material number to check.
- *
- * @return              Terrain type of the material if known,
- *                      else @c FLOOR_SOLID.
- */
-terraintype_t P_GetTerrainTypeForMaterial(materialnum_t num)
-{
-    if(num)
-        return TerrainTypes[num];
-    else
-        return FLOOR_SOLID;
-}
-
-/**
- * Returns the terrain type of the specified sector, plane.
- *
- * @param sec           The sector to check.
- * @param plane         The plane id to check.
- */
-terraintype_t P_GetTerrainType(sector_t* sec, int plane)
-{
-    materialnum_t       num =
-        P_GetIntp(sec, (plane? DMU_CEILING_MATERIAL : DMU_FLOOR_MATERIAL));
-
-    if(num)
-        return TerrainTypes[num];
-    else
-        return FLOOR_SOLID;
-}
-
-/**
  * Handles sector specials 25 - 39.
  */
 void P_PlayerInWindSector(player_t *player)

Modified: trunk/doomsday/plugins/jheretic/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_telept.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jheretic/src/p_telept.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -53,6 +53,7 @@
 #include "p_mapsetup.h"
 #include "p_map.h"
 #include "p_mapspec.h"
+#include "p_terraintype.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -160,16 +161,18 @@
     thing->angle = angle;
     if(thing->flags2 & MF2_FLOORCLIP)
     {
+        thing->floorClip = 0;
+
         if(thing->pos[VZ] ==
-            P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT) &&
-           P_MobjGetFloorTerrainType(thing) >= FLOOR_LIQUID)
+           P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT))
         {
-            thing->floorClip = 10;
+            const terraintype_t* tt = P_MobjGetFloorTerrainType(thing);
+
+            if(tt->flags & TTF_FLOORCLIP)
+            {
+                thing->floorClip = 10;
+            }
         }
-        else
-        {
-            thing->floorClip = 0;
-        }
     }
 
     if(thing->flags & MF_MISSILE)

Modified: trunk/doomsday/plugins/jhexen/include/p_local.h
===================================================================
--- trunk/doomsday/plugins/jhexen/include/p_local.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jhexen/include/p_local.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -60,6 +60,7 @@
 #include "p_actor.h"
 #include "p_spec.h"
 #include "d_net.h"
+#include "p_terraintype.h"
 
 #define STARTREDPALS        1
 #define STARTBONUSPALS      9
@@ -159,7 +160,7 @@
 boolean     P_CheckMissileSpawn(mobj_t *mo);
 float       P_MobjGetFriction(mobj_t *mo);
 void        P_RipperBlood(mobj_t *mo);
-terraintype_t P_MobjGetFloorTerrainType(mobj_t* mo);
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo);
 int         P_HitFloor(mobj_t *mo);
 
 // Spawn spots.

Modified: trunk/doomsday/plugins/jhexen/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/jhexen/include/p_mobj.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jhexen/include/p_mobj.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -44,6 +44,8 @@
 #  error "Using jHexen headers without __JHEXEN__"
 #endif
 
+#include "p_terraintype.h"
+
 #define MTF_EASY        1
 #define MTF_NORMAL      2
 #define MTF_HARD        4
@@ -202,9 +204,7 @@
 
     // Hexen-specific data:
     struct player_s *player; // Only valid if type == MT_PLAYER
-
-    materialnum_t   floorMaterial; // Contacted floor material.
-    mobjinfo_t     *info; // &mobjInfo[mobj->type]
+    mobjinfo_t*     info; // &mobjInfo[mobj->type]
     int             damage; // For missiles
     int             flags;
     int             flags2; // Heretic flags
@@ -214,7 +214,7 @@
     int             health;
     int             moveDir; // 0-7
     int             moveCount; // When 0, select a new dir
-    struct mobj_s  *target; // Thing being chased/attacked (or NULL)
+    struct mobj_s*  target; // Thing being chased/attacked (or NULL)
                             // also the originator for missiles
                             // used by player to freeze a bit after
                             // teleporting

Modified: trunk/doomsday/plugins/jhexen/include/p_spec.h
===================================================================
--- trunk/doomsday/plugins/jhexen/include/p_spec.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jhexen/include/p_spec.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -54,24 +54,6 @@
 
 #define MO_TELEPORTMAN          14
 
-// Any floor type >= FLOOR_LIQUID will floorclip sprites.
-typedef enum {
-    FLOOR_SOLID,
-    FLOOR_ICE,
-    FLOOR_LIQUID,
-    FLOOR_WATER,
-    FLOOR_LAVA,
-    FLOOR_SLUDGE,
-    NUM_TERRAIN_TYPES
-} terraintype_t;
-
-extern terraintype_t* TerrainTypes;
-
-void        P_InitTerrainTypes(void);
-terraintype_t P_GetTerrainType(sector_t* sec, int plane);
-terraintype_t P_MaterialToTerrainType(materialnum_t num);
-
-
 void        P_InitLava(void);
 
 void        P_SpawnSpecials(void);
@@ -83,13 +65,12 @@
                            int activationType);
 
 void        P_PlayerInSpecialSector(player_t *plr);
-void        P_PlayerOnSpecialFloor(player_t *plr, int floorType);
+void        P_PlayerOnSpecialFloor(player_t *plr);
 
 void        P_AnimateSurfaces(void);
 void        P_InitPicAnims(void);
 void        P_InitLightning(void);
 void        P_ForceLightning(void);
-void        R_HandleSectorSpecials(void);
 
 typedef enum {
     ok,

Modified: trunk/doomsday/plugins/jhexen/src/hrefresh.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/hrefresh.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jhexen/src/hrefresh.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -221,7 +221,6 @@
             int                 viewAngleOffset =
                 ANGLE_MAX * -G_GetLookOffset(DISPLAYPLAYER);
 
-            R_HandleSectorSpecials();
             // Set flags for the renderer.
             if(IS_CLIENT)
             {

Modified: trunk/doomsday/plugins/jhexen/src/p_enemy.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_enemy.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jhexen/src/p_enemy.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -2174,7 +2174,9 @@
 {
     if(actor->pos[VZ] <= actor->floorZ)
     {
-        if(P_MobjGetFloorTerrainType(actor) >= FLOOR_LIQUID)
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(actor);
+
+        if(tt->flags & TTF_NONSOLID)
         {
             P_HitFloor(actor);
             P_MobjChangeState(actor, S_NULL);
@@ -4193,21 +4195,18 @@
 
 void C_DECL A_IceSetTics(mobj_t* mo)
 {
+    const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
     mo->tics = 70 + (P_Random() & 63);
 
-    switch(P_MobjGetFloorTerrainType(mo))
+    if(tt->flags & TTF_FRICTION_LOW)
     {
-    case FLOOR_LAVA:
-        mo->tics /= 4;
-        break;
-
-    case FLOOR_ICE:
         mo->tics *= 2;
-        break;
-
-    default:
-        break;
     }
+    else if(tt->flags & TTF_FRICTION_HIGH)
+    {
+        mo->tics /= 4;
+    }
 }
 
 void C_DECL A_IceCheckHeadDone(mobj_t* mo)

Modified: trunk/doomsday/plugins/jhexen/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_mobj.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jhexen/src/p_mobj.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -108,12 +108,19 @@
 
 // CODE --------------------------------------------------------------------
 
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo)
+{
+    sector_t*           sec = P_GetPtrp(mo->subsector, DMU_SECTOR);
+
+    return P_GetPlaneMaterialType(sec, PLN_FLOOR);
+}
+
 /**
  * @return              @c true if the mobj is still present.
  */
 boolean P_MobjChangeState(mobj_t *mobj, statenum_t state)
 {
-    state_t    *st;
+    state_t*            st;
 
     if(state == S_NULL)
     {   // Remove mobj.
@@ -185,7 +192,9 @@
 
 void P_FloorBounceMissile(mobj_t *mo)
 {
-    if(P_HitFloor(mo) >= FLOOR_LIQUID)
+    boolean             shouldSplash = P_HitFloor(mo);
+
+    if(shouldSplash)
     {
         switch(mo->type)
         {
@@ -368,9 +377,12 @@
     {
         return FRICTION_FLY;
     }
-    else if(P_MobjGetFloorTerrainType(mo) == FLOOR_ICE)
+    else
     {
-        return FRICTION_LOW;
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+        if(tt->flags & TTF_FRICTION_LOW)
+            return FRICTION_LOW;
     }
 
     return FRICTION_NORMAL;
@@ -835,10 +847,13 @@
                                 break;
                             }
                     }
-                    else if((P_MobjGetFloorTerrainType(mo) < FLOOR_LIQUID) &&
-                            (!mo->player->morphTics))
+                    else if(!mo->player->morphTics)
                     {
-                        S_StartSound(SFX_PLAYER_LAND, mo);
+                        const terraintype_t* tt =
+                            P_MobjGetFloorTerrainType(mo);
+
+                        if(!(tt->flags & TTF_NONSOLID))
+                            S_StartSound(SFX_PLAYER_LAND, mo);
                     }
 
                     if(!cfg.useMLook && cfg.lookSpring)
@@ -1260,16 +1275,16 @@
         mo->pos[VZ] += mo->floorZ; // Artifact z passed in as height
     }
 
+    mo->floorClip = 0;
+
     if((mo->flags2 & MF2_FLOORCLIP) &&
-       P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID &&
-       mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
+        mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
     {
-        mo->floorClip = 10;
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+        if(tt->flags & TTF_FLOORCLIP)
+            mo->floorClip = 10;
     }
-    else
-    {
-        mo->floorClip = 0;
-    }
 
     return mo;
 }
@@ -1806,26 +1821,15 @@
     th->tics += P_Random() & 3;
 }
 
-terraintype_t P_MobjGetFloorTerrainType(mobj_t* mo)
+boolean P_HitFloor(mobj_t *thing)
 {
-    if(mo->floorMaterial && !IS_CLIENT)
-    {
-        return P_MaterialToTerrainType(mo->floorMaterial);
-    }
-    else
-    {
-        return P_GetTerrainType(P_GetPtrp(mo->subsector, DMU_SECTOR), PLN_FLOOR);
-    }
-}
-
-int P_HitFloor(mobj_t *thing)
-{
     mobj_t*             mo;
     int                 smallsplash = false;
+    const terraintype_t* tt;
 
     if(thing->floorZ != P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT))
     {   // Don't splash if landing on the edge above water/lava/etc....
-        return FLOOR_SOLID;
+        return false;
     }
 
     // Things that don't splash go here
@@ -1835,11 +1839,11 @@
     case MT_LEAF2:
     case MT_SPLASH:
     case MT_SLUDGECHUNK:
-        return FLOOR_SOLID;
+        return false;
 
     default:
         if(P_IsCamera(thing))
-            return FLOOR_SOLID;
+            return false;
         break;
     }
 
@@ -1847,9 +1851,9 @@
     if(thing->info->mass < 10)
         smallsplash = true;
 
-    switch(P_MobjGetFloorTerrainType(thing))
+    tt = P_MobjGetFloorTerrainType(thing);
+    if(tt->flags & TTF_SPAWN_SPLASHES)
     {
-    case FLOOR_WATER:
         if(smallsplash)
         {
             mo = P_SpawnMobj3f(MT_SPLASHBASE, thing->pos[VX],
@@ -1876,9 +1880,10 @@
                 P_NoiseAlert(thing, thing);
             S_StartSound(SFX_WATER_SPLASH, mo);
         }
-        return FLOOR_WATER;
-
-    case FLOOR_LAVA:
+        return true;
+    }
+    else if(tt->flags & TTF_SPAWN_SMOKE)
+    {
         if(smallsplash)
         {
             mo = P_SpawnMobj3f(MT_LAVASPLASH, thing->pos[VX],
@@ -1903,9 +1908,10 @@
         {
             P_DamageMobj(thing, &LavaInflictor, NULL, 5);
         }
-        return FLOOR_LAVA;
-
-    case FLOOR_SLUDGE:
+        return true;
+    }
+    else if(tt->flags & TTF_SPAWN_SLUDGE)
+    {
         if(smallsplash)
         {
             mo = P_SpawnMobj3f(MT_SLUDGESPLASH, thing->pos[VX],
@@ -1930,10 +1936,10 @@
         }
 
         S_StartSound(SFX_SLUDGE_GLOOP, mo);
-        return FLOOR_SLUDGE;
+        return true;
     }
 
-    return FLOOR_SOLID;
+    return false;
 }
 
 void ResetBlasted(mobj_t *mo)

Modified: trunk/doomsday/plugins/jhexen/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_spec.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jhexen/src/p_spec.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -87,19 +87,6 @@
 
 mobj_t  LavaInflictor;
 
-terraintype_t* TerrainTypes = 0;
-struct terraindef_s {
-    char*           name;
-    terraintype_t   type;
-} TerrainTypeDefs[] =
-{
-    {"X_005", FLOOR_WATER},
-    {"X_001", FLOOR_LAVA},
-    {"X_009", FLOOR_SLUDGE},
-    {"F_033", FLOOR_ICE},
-    {"END", -1}
-};
-
 materialnum_t Sky1Material;
 materialnum_t Sky2Material;
 float Sky1ColumnOffset;
@@ -171,60 +158,6 @@
     }
 }
 
-void P_InitTerrainTypes(void)
-{
-    int                 i, size;
-    materialnum_t       num;
-
-    size = Get(DD_NUMLUMPS) * sizeof(int);
-
-    // Free if there already is memory allocated.
-    if(TerrainTypes)
-        Z_Free(TerrainTypes);
-
-    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
-    memset(TerrainTypes, 0, size);
-
-    for(i = 0; TerrainTypeDefs[i].type != -1; ++i)
-    {
-        num = R_MaterialCheckNumForName(TerrainTypeDefs[i].name, MAT_FLAT);
-        if(num)
-        {
-            TerrainTypes[num] = TerrainTypeDefs[i].type;
-        }
-    }
-}
-
-/**
- * Return the terrain type of the specified material.
- *
- * @param num           The material to check.
- */
-terraintype_t P_MaterialToTerrainType(materialnum_t num)
-{
-    if(num)
-        return TerrainTypes[num];
-    else
-        return FLOOR_SOLID;
-}
-
-/**
- * Returns the terrain type of the specified sector, plane.
- *
- * @param sec           The sector to check.
- * @param plane         The plane id to check.
- */
-terraintype_t P_GetTerrainType(sector_t* sec, int plane)
-{
-    materialnum_t       num =
-        P_GetIntp(sec, (plane? DMU_CEILING_MATERIAL : DMU_FLOOR_MATERIAL));
-
-    if(num)
-        return TerrainTypes[num];
-    else
-        return FLOOR_SOLID;
-}
-
 boolean EV_SectorSoundChange(byte* args)
 {
     boolean             rtn = false;
@@ -844,26 +777,23 @@
     }
 }
 
-void P_PlayerOnSpecialFloor(player_t *player, int floorType)
+void P_PlayerOnSpecialFloor(player_t* player)
 {
+    const terraintype_t* tt = P_MobjGetFloorTerrainType(player->plr->mo);
+
+    if(!(tt->flags & TTF_DAMAGING))
+        return;
+
     if(player->plr->mo->pos[VZ] >
        P_GetFloatp(player->plr->mo->subsector, DMU_FLOOR_HEIGHT))
     {
         return; // Player is not touching the floor
     }
 
-    switch(floorType)
+    if(!(levelTime & 31))
     {
-    case FLOOR_LAVA:
-        if(!(levelTime & 31))
-        {
-            P_DamageMobj(player->plr->mo, &LavaInflictor, NULL, 10);
-            S_StartSound(SFX_LAVA_SIZZLE, player->plr->mo);
-        }
-        break;
-
-    default:
-        break;
+        P_DamageMobj(player->plr->mo, &LavaInflictor, NULL, 10);
+        S_StartSound(SFX_LAVA_SIZZLE, player->plr->mo);
     }
 }
 
@@ -1001,126 +931,133 @@
     P_FreeButtons();
 }
 
-void R_HandleSectorSpecials(void)
+void P_AnimateSurfaces(void)
 {
-    uint        i;
-    int         scrollOffset = levelTime >> 1 & 63;
+#define PLANE_MATERIAL_SCROLLUNIT (8.f/35*2)
 
+    uint                i;
+    linedef_t*          line;
+
+    // Update scrolling plane materials.
     for(i = 0; i < numsectors; ++i)
     {
-        xsector_t* sect = P_ToXSector(P_ToPtr(DMU_SECTOR, i));
+        xsector_t*          sect = P_ToXSector(P_ToPtr(DMU_SECTOR, i));
+        float               texOff[2];
 
         switch(sect->special)
-        {                       // Handle scrolling flats
+        {
         case 201:
         case 202:
         case 203:               // Scroll_North_xxx
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y,
-                       (63 - scrollOffset) << (sect->special - 201));
+            texOff[VY] = P_GetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y);
+            texOff[VY] -= PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 201);
+            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y, texOff[VY]);
             break;
 
         case 204:
         case 205:
         case 206:               // Scroll_East_xxx
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X,
-                       (63 - scrollOffset) << (sect->special - 204));
+            texOff[VX] = P_GetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X);
+            texOff[VX] -= PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 204);
+            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X, texOff[VX]);
             break;
 
         case 207:
         case 208:
         case 209:               // Scroll_South_xxx
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y,
-                       scrollOffset << (sect->special - 207));
+            texOff[VY] = P_GetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y);
+            texOff[VY] += PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 207);
+            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y, texOff[VY]);
             break;
 
         case 210:
         case 211:
         case 212:               // Scroll_West_xxx
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X,
-                       scrollOffset << (sect->special - 210));
+            texOff[VX] = P_GetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X);
+            texOff[VX] += PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 210);
+            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X, texOff[VX]);
             break;
 
         case 213:
         case 214:
         case 215:               // Scroll_NorthWest_xxx
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X,
-                       scrollOffset << (sect->special - 213));
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y,
-                       (63 - scrollOffset) << (sect->special - 213));
+            P_GetFloatv(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_XY, texOff);
+            texOff[VX] += PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 213);
+            texOff[VY] -= PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 213);
+            P_SetFloatv(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_XY, texOff);
             break;
 
         case 216:
         case 217:
         case 218:               // Scroll_NorthEast_xxx
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X,
-                       (63 - scrollOffset) << (sect->special - 216));
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y,
-                       (63 - scrollOffset) << (sect->special - 216));
+            P_GetFloatv(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_XY, texOff);
+            texOff[VX] -= PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 216);
+            texOff[VY] -= PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 216);
+            P_SetFloatv(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_XY, texOff);
             break;
 
         case 219:
         case 220:
         case 221:               // Scroll_SouthEast_xxx
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X,
-                       (63 - scrollOffset) << (sect->special - 219));
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y,
-                       scrollOffset << (sect->special - 219));
+            P_GetFloatv(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_XY, texOff);
+            texOff[VX] -= PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 219);
+            texOff[VY] += PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 219);
+            P_SetFloatv(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_XY, texOff);
             break;
 
         case 222:
         case 223:
         case 224:               // Scroll_SouthWest_xxx
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X,
-                       scrollOffset << (sect->special - 222));
-            P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y,
-                       scrollOffset << (sect->special - 222));
+            P_GetFloatv(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_XY, texOff);
+            texOff[VX] += PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 222);
+            texOff[VY] += PLANE_MATERIAL_SCROLLUNIT * (1 + sect->special - 222);
+            P_SetFloatv(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_XY, texOff);
             break;
 
         default:
+            // DJS - Is this really necessary every tic?
             P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_X, 0);
             P_SetFloat(DMU_SECTOR, i, DMU_FLOOR_MATERIAL_OFFSET_Y, 0);
             break;
         }
     }
-}
 
-void P_AnimateSurfaces(void)
-{
-    int         i;
-    linedef_t     *line;
-
-    // Update scrolling textures
+    // Update scrolling wall materials.
     if(P_IterListSize(linespecials))
     {
         P_IterListResetIterator(linespecials, false);
         while((line = P_IterListIterator(linespecials)) != NULL)
         {
-            sidedef_t* side = 0;
-            fixed_t texOff[2];
+            sidedef_t*          side = 0;
+            fixed_t             texOff[2];
+            xline_t*            xline = P_ToXLine(line);
 
             side = P_GetPtrp(line, DMU_SIDEDEF0);
-            for(i =0; i < 3; ++i)
+            for(i = 0; i < 3; ++i)
             {
-
                 P_GetFixedpv(side,
                              (i==0? DMU_TOP_MATERIAL_OFFSET_XY :
                               i==1? DMU_MIDDLE_MATERIAL_OFFSET_XY :
                               DMU_BOTTOM_MATERIAL_OFFSET_XY), texOff);
 
-                switch (P_ToXLine(line)->special)
+                switch(xline->special)
                 {
-                case 100:               // Scroll_Texture_Left
-                    texOff[0] += P_ToXLine(line)->arg1 << 10;
+                case 100: // Scroll_Texture_Left
+                    texOff[0] += xline->arg1 << 10;
                     break;
-                case 101:               // Scroll_Texture_Right
-                    texOff[0] -= P_ToXLine(line)->arg1 << 10;
+                case 101: // Scroll_Texture_Right
+                    texOff[0] -= xline->arg1 << 10;
                     break;
-                case 102:               // Scroll_Texture_Up
-                    texOff[1] += P_ToXLine(line)->arg1 << 10;
+                case 102: // Scroll_Texture_Up
+                    texOff[1] += xline->arg1 << 10;
                     break;
-                case 103:               // Scroll_Texture_Down
-                    texOff[1] -= P_ToXLine(line)->arg1 << 10;
+                case 103: // Scroll_Texture_Down
+                    texOff[1] -= xline->arg1 << 10;
                     break;
+                default:
+                    Con_Error("P_AnimateSurfaces: Invalid line special %i for "
+                              "material scroller on linedef %ui.",
+                              xline->special, P_ToIndex(line));
                 }
 
                 P_SetFixedpv(side,
@@ -1148,6 +1085,8 @@
             NextLightningFlash--;
         }
     }
+
+#undef PLANE_MATERIAL_SCROLLUNIT
 }
 
 static void P_LightningFlash(void)

Modified: trunk/doomsday/plugins/jhexen/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_telept.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/jhexen/src/p_telept.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -237,16 +237,17 @@
 
     if(mo->flags2 & MF2_FLOORCLIP)
     {
-        if(mo->pos[VZ] ==
-           P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT) &&
-           P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID)
+        mo->floorClip = 0;
+
+        if(mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
         {
-            mo->floorClip = 10;
+            const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+            if(tt->flags & TTF_FLOORCLIP)
+            {
+                mo->floorClip = 10;
+            }
         }
-        else
-        {
-            mo->floorClip = 0;
-        }
     }
 
     if(mo->flags & MF_MISSILE)
@@ -262,8 +263,6 @@
 
     P_MobjClearSRVO(mo);
 
-    // Update the floor material.
-    mo->floorMaterial = tmFloorMaterial;
     return true;
 }
 

Modified: trunk/doomsday/plugins/wolftc/include/p_local.h
===================================================================
--- trunk/doomsday/plugins/wolftc/include/p_local.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/wolftc/include/p_local.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -99,21 +99,6 @@
 extern int      armorpoints[4];    // Green, blue, IDFA and IDKFA points.
 extern int      armorclass[4];     // Green and blue classes.
 
-//
-// P_MOBJ
-//
-// Any floor type >= FLOOR_LIQUID will floorclip sprites
-enum {
-    FLOOR_SOLID,
-    FLOOR_LIQUID,
-    FLOOR_WATER,
-    FLOOR_LAVA,
-    FLOOR_SLUDGE,
-    FLOOR_BLOOD,
-    FLOOR_SLIME,
-    NUM_TERRAINTYPES
-};
-
 #define FRICTION_NORMAL     (0.90625f)
 #define FRICTION_FLY        (0.91796875f)
 
@@ -129,7 +114,6 @@
 
 boolean     P_MobjChangeState(mobj_t *mobj, statenum_t state);
 void        P_MobjThinker(mobj_t *mobj);
-int         P_MobjGetFloorTerrainType(mobj_t *thing);
 void        P_RipperBlood(mobj_t *mo);
 void        P_SetDoomsdayFlags(mobj_t *mo);
 void        P_HitFloor(mobj_t *mo);

Modified: trunk/doomsday/plugins/wolftc/include/p_mobj.h
===================================================================
--- trunk/doomsday/plugins/wolftc/include/p_mobj.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/wolftc/include/p_mobj.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -34,25 +34,12 @@
 #  error "Using WolfTC headers without __WOLFTC__"
 #endif
 
-// Basics.
 #include "tables.h"
-
-// We need the thinker_t stuff.
+#include "p_terraintype.h"
 #include "d_think.h"
-
-// We need the WAD data structure for Map things,
-// from the THINGS lump.
 #include "doomdata.h"
-
-// States are tied to finite states are
-//  tied to animation frames.
-// Needs precompiled tables/data structures.
 #include "info.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 /**
  * (Re)Spawn flags:
  */
@@ -267,4 +254,6 @@
 mobj_t*     P_SpawnMissile(mobjtype_t type, mobj_t *source, mobj_t *dest);
 mobj_t*     P_SpawnTeleFog(float x, float y, angle_t angle);
 
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo);
+
 #endif

Modified: trunk/doomsday/plugins/wolftc/include/p_spec.h
===================================================================
--- trunk/doomsday/plugins/wolftc/include/p_spec.h	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/wolftc/include/p_spec.h	2008-07-08 21:00:46 UTC (rev 5827)
@@ -55,8 +55,6 @@
 
 // at game start
 void            P_InitPicAnims(void);
-void            P_InitTerrainTypes(void);
-
 // at map load
 void            P_SpawnSpecials(void);
 
@@ -64,8 +62,6 @@
 void            P_UpdateSpecials(void);
 
 // when needed
-int             P_GetTerrainType(sector_t* sec, int plane);
-int             P_FlatToTerrainType(int flatlumpnum);
 boolean         P_ActivateLine(linedef_t *ld, mobj_t *mo, int side,
                                int activationType);
 

Modified: trunk/doomsday/plugins/wolftc/src/p_mobj.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_mobj.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/wolftc/src/p_mobj.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -44,6 +44,7 @@
 #include "hu_stuff.h"
 #include "g_common.h"
 #include "p_map.h"
+#include "p_terraintype.h"
 #include "p_player.h"
 
 // MACROS ------------------------------------------------------------------
@@ -90,6 +91,18 @@
 
 // CODE --------------------------------------------------------------------
 
+const terraintype_t* P_MobjGetFloorTerrainType(mobj_t* mo)
+{
+    if(mo->floorMaterial && !IS_CLIENT)
+    {
+        return P_TerrainTypeForMaterial(mo->floorMaterial);
+    }
+    else
+    {
+        return P_GetPlaneMaterialType(P_GetPtrp(mo->subsector, DMU_SECTOR), PLN_FLOOR);
+    }
+}
+
 /**
  * @return              @c true, if the mobj is still present.
  */
@@ -388,11 +401,6 @@
     th->tics += P_Random() & 3;
 }
 
-int P_MobjGetFloorTerrainType(mobj_t *thing)
-{
-    return P_GetTerrainType(P_GetPtrp(thing->subsector, DMU_SECTOR), PLN_FLOOR);
-}
-
 void P_HitFloor(mobj_t *mo)
 {
     //P_MobjSectorsIterator(mo, PIT_Splash, mo);
@@ -885,16 +893,18 @@
         }
     }
 
+    mo->floorClip = 0;
+
     if((mo->flags2 & MF2_FLOORCLIP) &&
-       P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID &&
        mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
     {
-        mo->floorClip = 10;
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+        if(tt->flags & TTF_FLOORCLIP)
+        {
+            mo->floorClip = 10;
+        }
     }
-    else
-    {
-        mo->floorClip = 0;
-    }
 
     return mo;
 }
@@ -967,16 +977,18 @@
     mo = P_SpawnMobj3fv(i, pos);
     mo->angle = sobj->angle;
 
+    mo->floorClip = 0;
+
     if((mo->flags2 & MF2_FLOORCLIP) &&
-       P_MobjGetFloorTerrainType(mo) >= FLOOR_LIQUID &&
        mo->pos[VZ] == P_GetFloatp(mo->subsector, DMU_FLOOR_HEIGHT))
     {
-        mo->floorClip = 10;
+        const terraintype_t* tt = P_MobjGetFloorTerrainType(mo);
+
+        if(tt->flags & TTF_FLOORCLIP)
+        {
+            mo->floorClip = 10;
+        }
     }
-    else
-    {
-        mo->floorClip = 0;
-    }
 
     // Copy spawn attributes to the new mobj.
     memcpy(mo->spawnSpot.pos, sobj->pos, sizeof(mo->spawnSpot.pos));
@@ -1183,7 +1195,7 @@
     }
 
     pos[VX] = (float) th->pos[VX];
-    pos[VY] = (float) th->[VY];
+    pos[VY] = (float) th->pos[VY];
 
     if(mobjInfo[i].flags & MF_SPAWNCEILING)
         pos[VZ] = ONCEILINGZ;

Modified: trunk/doomsday/plugins/wolftc/src/p_spec.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_spec.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/wolftc/src/p_spec.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -88,76 +88,10 @@
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-//// \bug From jHeretic, replace!
-int    *TerrainTypes;
-struct {
-    char   *name;
-    int     type;
-} TerrainTypeDefs[] =
-{
-    {"FWATER1", FLOOR_WATER},
-    {"LAVA1",   FLOOR_LAVA},
-    {"BLOOD1",  FLOOR_BLOOD},
-    {"NUKAGE1", FLOOR_SLIME},
-    {"SLIME01", FLOOR_SLUDGE},
-    {"END",     -1}
-};
-
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
 // CODE --------------------------------------------------------------------
 
-/**
- * \bug This routine originated from jHeretic, we need to rewrite it!
- */
-void P_InitTerrainTypes(void)
-{
-    int     i;
-    int     lump;
-    int     size;
-
-    size = Get(DD_NUMLUMPS) * sizeof(int);
-    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
-    memset(TerrainTypes, 0, size);
-    for(i = 0; TerrainTypeDefs[i].type != -1; i++)
-    {
-        lump = W_CheckNumForName(TerrainTypeDefs[i].name);
-        if(lump != -1)
-        {
-            TerrainTypes[lump] = TerrainTypeDefs[i].type;
-        }
-    }
-}
-
-/*
- * Return the terrain type of the specified flat.
- *
- * @param flatlumpnum   The flat lump number to check.
- */
-int P_FlatToTerrainType(int flatlumpnum)
-{
-    if(flatlumpnum != -1)
-        return TerrainTypes[flatlumpnum];
-    else
-        return FLOOR_SOLID;
-}
-
-/*
- * Returns the terrain type of the specified sector, plane.
- *
- * @param sec       The sector to check.
- * @param plane     The plane id to check.
- */
-int P_GetTerrainType(sector_t* sec, int plane)
-{
-    int flatnum = P_GetIntp(sec, (plane? DMU_CEILING_MATERIAL : DMU_FLOOR_MATERIAL));
-
-    if(flatnum != -1)
-        return TerrainTypes[flatnum];
-    else
-        return FLOOR_SOLID;
-}
-
 /* From PrBoom:
  * Load the table of animation definitions, checking for existence of
  * the start and end of each frame. If the start doesn't exist the sequence

Modified: trunk/doomsday/plugins/wolftc/src/p_telept.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_telept.c	2008-07-08 18:09:21 UTC (rev 5826)
+++ trunk/doomsday/plugins/wolftc/src/p_telept.c	2008-07-08 21:00:46 UTC (rev 5827)
@@ -35,6 +35,7 @@
 #include "dmu_lib.h"
 #include "p_mapsetup.h"
 #include "p_map.h"
+#include "p_terraintype.h"
 #include "p_mapspec.h"
 
 // MACROS ------------------------------------------------------------------
@@ -133,16 +134,19 @@
             thing->angle = m->angle;
             if(thing->flags2 & MF2_FLOORCLIP)
             {
+                thing->floorClip = 0;
+
                 if(thing->pos[VZ] ==
-                    P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT) &&
-                   P_MobjGetFloorTerrainType(thing) >= FLOOR_LIQUID)
+                   P_GetFloatp(thing->subsector, DMU_FLOOR_HEIGHT))
                 {
-                    thing->floorClip = 10;
+                    const terraintype_t* tt =
+                        P_MobjGetFloorTerrainType(thing);
+
+                    if(tt->flags & TTF_FLOORCLIP)
+                    {
+                        thing->floorClip = 10;
+                    }
                 }
-                else
-                {
-                    thing->floorClip = 0;
-                }
             }
             thing->mom[MX] = thing->mom[MY] = thing->mom[MZ] = 0;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5831
          http://deng.svn.sourceforge.net/deng/?rev=5831&view=rev
Author:   danij
Date:     2008-07-11 05:15:57 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
Fixed (all games): If weapon ammo requirements are edited in values.ded so that all weapons require ammo; When all ammo had been expended P_MaybeChangeWeapon correctly concluded that no change would produce a fire-able weapon and thus player_t->pendingWeapon == WT_NOCHANGE. However, P_CheckAmmo was then changing the psprite to the downstate regardless of the fact that no weapon would subsequently be raised afterwards (leaving the player running around with no weapon in view and no means to change weapon again even after collecting more ammo).

Modified Paths:
--------------
    trunk/doomsday/plugins/jdoom/src/p_pspr.c
    trunk/doomsday/plugins/jdoom64/src/p_pspr.c
    trunk/doomsday/plugins/jheretic/src/p_pspr.c
    trunk/doomsday/plugins/jhexen/src/p_pspr.c
    trunk/doomsday/plugins/wolftc/src/p_pspr.c

Modified: trunk/doomsday/plugins/jdoom/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_pspr.c	2008-07-11 11:03:13 UTC (rev 5830)
+++ trunk/doomsday/plugins/jdoom/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
@@ -169,7 +169,7 @@
 
     // Check we have enough of ALL ammo types used by this weapon.
     good = true;
-    for(i=0; i < NUM_AMMO_TYPES && good; ++i)
+    for(i = 0; i < NUM_AMMO_TYPES && good; ++i)
     {
         if(!weaponInfo[player->readyWeapon][player->class].mode[0].ammoType[i])
             continue; // Weapon does not take this type of ammo.
@@ -191,7 +191,8 @@
     P_MaybeChangeWeapon(player, WT_NOCHANGE, AT_NOAMMO, false);
 
     // Now set appropriate weapon overlay.
-    P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
+    if(player->pendingWeapon != WT_NOCHANGE)
+        P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
 
     return false;
 }
@@ -402,6 +403,8 @@
     int                 damage;
     float               slope;
 
+    P_ShotAmmo(player);
+    player->update |= PSF_AMMO;
     if(IS_CLIENT)
         return;
 
@@ -435,6 +438,8 @@
     int                 damage;
     float               slope;
 
+    P_ShotAmmo(player);
+    player->update |= PSF_AMMO;
     if(IS_CLIENT)
         return;
 

Modified: trunk/doomsday/plugins/jdoom64/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_pspr.c	2008-07-11 11:03:13 UTC (rev 5830)
+++ trunk/doomsday/plugins/jdoom64/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
@@ -190,7 +190,8 @@
     P_MaybeChangeWeapon(player, WT_NOCHANGE, AT_NOAMMO, false);
 
     // Now set appropriate weapon overlay.
-    P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
+    if(player->pendingWeapon != WT_NOCHANGE)
+        P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
 
     return false;
 }
@@ -404,6 +405,8 @@
     int                 damage;
     float               slope;
 
+    P_ShotAmmo(player);
+    player->update |= PSF_AMMO;
     if(IS_CLIENT)
         return;
 
@@ -435,6 +438,8 @@
     int                 damage;
     float               slope;
 
+    P_ShotAmmo(player);
+    player->update |= PSF_AMMO;
     if(IS_CLIENT)
         return;
 
@@ -533,16 +538,14 @@
     mobj_t             *pmo;
     short               laserPower;
 
+    P_ShotAmmo(player);
     P_SetPsprite(player, ps_flash,
                  weaponInfo[player->readyWeapon][player->class].mode[0].flashState);
-
+    player->update |= PSF_AMMO;
     if(IS_CLIENT)
         return;
 
-    P_ShotAmmo(player);
-
     pmo = player->plr->mo;
-    player->update |= PSF_AMMO;
 
     laserPower = 0;
     if(player->artifacts[it_laserpw1])

Modified: trunk/doomsday/plugins/jheretic/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_pspr.c	2008-07-11 11:03:13 UTC (rev 5830)
+++ trunk/doomsday/plugins/jheretic/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
@@ -680,7 +680,7 @@
 /**
  *Initialize weapon info, maxammo and clipammo.
  */
-void P_InitWeaponInfo()
+void P_InitWeaponInfo(void)
 {
 #define WPINF "Weapon Info|"
 
@@ -817,8 +817,9 @@
     // Out of ammo, pick a weapon to change to.
     P_MaybeChangeWeapon(player, WT_NOCHANGE, AT_NOAMMO, false);
 
-    P_SetPsprite(player, ps_weapon,
-                 weaponInfo[player->readyWeapon][player->class].mode[lvl].downState);
+    if(player->pendingWeapon != WT_NOCHANGE)
+        P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[lvl].downState);
+
     return false;
 }
 
@@ -1124,6 +1125,7 @@
     int                 damage;
     float               slope;
 
+    P_ShotAmmo(player);
     damage = 1 + (P_Random() & 3);
     angle = player->plr->mo->angle;
     slope = P_AimLineAttack(player->plr->mo, angle, MELEERANGE);
@@ -1149,6 +1151,7 @@
     int                 damage;
     float               slope;
 
+    P_ShotAmmo(player);
     damage = HITDICE(4);
     angle = player->plr->mo->angle;
     slope = P_AimLineAttack(player->plr->mo, angle, MELEERANGE);
@@ -1174,6 +1177,7 @@
     int                 damage;
     float               slope;
 
+    P_ShotAmmo(player);
     damage = 5 + (P_Random() & 15);
     angle = player->plr->mo->angle;
     angle += (P_Random() - P_Random()) << 18;
@@ -1197,6 +1201,7 @@
     int                 damage;
     float               slope;
 
+    P_ShotAmmo(player);
     damage = 18 + (P_Random() & 63);
     angle = player->plr->mo->angle;
     angle += (P_Random() - P_Random()) << 18;
@@ -1621,7 +1626,6 @@
         return;
 
     P_ShotAmmo(player);
-
     if(IS_CLIENT)
         return;
 
@@ -1640,7 +1644,6 @@
 void C_DECL A_FireSkullRodPL2(player_t *player, pspdef_t *psp)
 {
     P_ShotAmmo(player);
-
     if(IS_CLIENT)
         return;
 
@@ -1901,6 +1904,7 @@
     int                 damage, randVal;
     float               slope, dist;
 
+    P_ShotAmmo(player);
     psp->pos[VX] = ((P_Random() & 3) - 2);
     psp->pos[VY] = WEAPONTOP + (P_Random() & 3);
     angle = player->plr->mo->angle;

Modified: trunk/doomsday/plugins/jhexen/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_pspr.c	2008-07-11 11:03:13 UTC (rev 5830)
+++ trunk/doomsday/plugins/jhexen/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
@@ -535,8 +535,9 @@
     P_MaybeChangeWeapon(plr, WT_NOCHANGE, AT_NOAMMO, false);
 
     // Now set appropriate weapon overlay.
-    P_SetPsprite(plr, ps_weapon,
-                 weaponInfo[plr->readyWeapon][plr->class].mode[0].downState);
+    if(player->pendingWeapon != WT_NOCHANGE)
+        P_SetPsprite(plr, ps_weapon, weaponInfo[plr->readyWeapon][plr->class].mode[0].downState);
+
     return false;
 }
 

Modified: trunk/doomsday/plugins/wolftc/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_pspr.c	2008-07-11 11:03:13 UTC (rev 5830)
+++ trunk/doomsday/plugins/wolftc/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
@@ -188,7 +188,8 @@
     P_MaybeChangeWeapon(player, WT_NOCHANGE, AT_NOAMMO, false);
 
     // Now set appropriate weapon overlay.
-    P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
+    if(player->pendingWeapon != WT_NOCHANGE)
+        P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
 
     return false;
 }
@@ -397,6 +398,8 @@
     int         damage;
     float       slope;
 
+    P_ShotAmmo(player);
+    player->update |= PSF_AMMO;
     if(IS_CLIENT)
         return;
 
@@ -428,6 +431,8 @@
     int         damage;
     float       slope;
 
+    P_ShotAmmo(player);
+    player->update |= PSF_AMMO;
     if(IS_CLIENT)
         return;
 
@@ -913,6 +918,8 @@
     int         damage;
     float       slope;
 
+    P_ShotAmmo(player);
+    player->update |= PSF_AMMO;
     if(IS_CLIENT)
         return;
 
@@ -1719,11 +1726,16 @@
 //
 void C_DECL A_FireCMissile2NA(player_t *player, pspdef_t * psp)
 {
+    P_ShotAmmo(player);
 
     P_SetPsprite(player, ps_flash,
                  weaponInfo[player->readyWeapon][player->class].mode[0].flashState +
                  (P_Random() & 1));
 
+    player->update |= PSF_AMMO;
+    if(IS_CLIENT)
+        return;
+
     P_SpawnMissile(MT_CATAPMISSILE2, player->plr->mo, NULL);
 }
 
@@ -1733,10 +1745,13 @@
 //
 void C_DECL A_FireCMissile3(player_t *player, pspdef_t * psp)
 {
-
+    P_ShotAmmo(player);
     P_SetPsprite(player, ps_flash,
                  weaponInfo[player->readyWeapon][player->class].mode[0].flashState +
                  (P_Random() & 1));
+    player->update |= PSF_AMMO;
+    if(IS_CLIENT)
+        return;
 
     P_SpawnMissile(MT_CATAPMISSILE2, player->plr->mo, NULL);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5832
          http://deng.svn.sourceforge.net/deng/?rev=5832&view=rev
Author:   danij
Date:     2008-07-11 06:22:36 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
Commonized P_CheckAmmo.

Modified Paths:
--------------
    trunk/doomsday/plugins/common/include/p_player.h
    trunk/doomsday/plugins/common/src/p_player.c
    trunk/doomsday/plugins/jdoom/src/p_pspr.c
    trunk/doomsday/plugins/jdoom64/src/p_pspr.c
    trunk/doomsday/plugins/jheretic/src/p_pspr.c
    trunk/doomsday/plugins/jhexen/src/p_pspr.c
    trunk/doomsday/plugins/wolftc/src/p_pspr.c

Modified: trunk/doomsday/plugins/common/include/p_player.h
===================================================================
--- trunk/doomsday/plugins/common/include/p_player.h	2008-07-11 12:15:57 UTC (rev 5831)
+++ trunk/doomsday/plugins/common/include/p_player.h	2008-07-11 13:22:36 UTC (rev 5832)
@@ -26,6 +26,9 @@
  * p_player.h: Common playsim routines relating to players.
  */
 
+#ifndef __COMMON_PLAYER_H__
+#define __COMMON_PLAYER_H__
+
 #if __WOLFTC__
 #  include "wolftc.h"
 #elif __JDOOM__
@@ -46,6 +49,7 @@
 weapontype_t P_PlayerFindWeapon(player_t *player, boolean next);
 weapontype_t P_MaybeChangeWeapon(player_t *player, weapontype_t weapon,
                                  ammotype_t ammo, boolean force);
+boolean     P_CheckAmmo(player_t* plr);
 void        P_ShotAmmo(player_t *player);
 
 void        P_PlayerThink(player_t *player, timespan_t ticLength);
@@ -58,3 +62,4 @@
 
 boolean     P_IsCamera(mobj_t *mo);
 void        P_PlayerThinkCamera(player_t *player);
+#endif

Modified: trunk/doomsday/plugins/common/src/p_player.c
===================================================================
--- trunk/doomsday/plugins/common/src/p_player.c	2008-07-11 12:15:57 UTC (rev 5831)
+++ trunk/doomsday/plugins/common/src/p_player.c	2008-07-11 13:22:36 UTC (rev 5832)
@@ -363,6 +363,70 @@
 }
 
 /**
+ * Checks if the player has enough ammo to fire their readied weapon.
+ * If not, a weapon change is instigated.
+ *
+ * @return              @c true, if there is enough ammo to fire.
+ */
+boolean P_CheckAmmo(player_t* plr)
+{
+    int                 count, fireMode;
+    boolean             good;
+    ammotype_t          i;
+    weaponinfo_t*       wInfo;
+
+    wInfo = &weaponInfo[plr->readyWeapon][plr->class];
+#if __JDOOM__ || __JDOOM64__ || __JHEXEN__ || __WOLFTC__
+    fireMode = 0;
+#endif
+#if __JHERETIC__
+    // If deathmatch always use firemode two ammo requirements.
+    if(plr->powers[PT_WEAPONLEVEL2] && !deathmatch)
+        fireMode = 1;
+    else
+        fireMode = 0;
+#endif
+
+#if __JHEXEN__
+    //// \kludge Work around the multiple firing modes problems.
+    //// We need to split the weapon firing routines and implement them as
+    //// new fire modes.
+    if(plr->class == PCLASS_FIGHTER && plr->readyWeapon != WT_FOURTH)
+        return true;
+    // < KLUDGE
+#endif
+
+    // Check we have enough of ALL ammo types used by this weapon.
+    good = true;
+    for(i = 0; i < NUM_AMMO_TYPES && good; ++i)
+    {
+        if(!wInfo->mode[fireMode].ammoType[i])
+            continue; // Weapon does not take this type of ammo.
+
+        // Minimal amount for one shot varies.
+        count = wInfo->mode[fireMode].perShot[i];
+
+        // Return if current ammunition sufficient.
+        if(plr->ammo[i] < count)
+        {
+            good = false;
+        }
+    }
+
+    if(good)
+        return true;
+
+    // Out of ammo, pick a weapon to change to.
+    P_MaybeChangeWeapon(plr, WT_NOCHANGE, AT_NOAMMO, false);
+
+    // Now set appropriate weapon overlay.
+    if(plr->pendingWeapon != WT_NOCHANGE)
+        P_SetPsprite(plr, ps_weapon, wInfo->mode[fireMode].downState);
+
+    return false;
+}
+
+/**
  * Return the next weapon for the given player. Can return the existing
  * weapon if no other valid choices. Preferences are NOT user selectable.
  *

Modified: trunk/doomsday/plugins/jdoom/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jdoom/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
+++ trunk/doomsday/plugins/jdoom/src/p_pspr.c	2008-07-11 13:22:36 UTC (rev 5832)
@@ -155,48 +155,6 @@
     P_SetPsprite(player, ps_weapon, wminfo->upState);
 }
 
-/**
- * Checks if the player has enough ammo to fire their readied weapon.
- * If not, a weapon change is instigated.
- *
- * @return              @c true, if there is enough ammo to fire.
- */
-boolean P_CheckAmmo(player_t *player)
-{
-    ammotype_t          i;
-    int                 count;
-    boolean             good;
-
-    // Check we have enough of ALL ammo types used by this weapon.
-    good = true;
-    for(i = 0; i < NUM_AMMO_TYPES && good; ++i)
-    {
-        if(!weaponInfo[player->readyWeapon][player->class].mode[0].ammoType[i])
-            continue; // Weapon does not take this type of ammo.
-
-        // Minimal amount for one shot varies.
-        count = weaponInfo[player->readyWeapon][player->class].mode[0].perShot[i];
-
-        // Return if current ammunition sufficient.
-        if(player->ammo[i] < count)
-        {
-            good = false;
-        }
-    }
-
-    if(good)
-        return true;
-
-    // Out of ammo, pick a weapon to change to.
-    P_MaybeChangeWeapon(player, WT_NOCHANGE, AT_NOAMMO, false);
-
-    // Now set appropriate weapon overlay.
-    if(player->pendingWeapon != WT_NOCHANGE)
-        P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
-
-    return false;
-}
-
 void P_FireWeapon(player_t *player)
 {
     statenum_t          newstate;

Modified: trunk/doomsday/plugins/jdoom64/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jdoom64/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
+++ trunk/doomsday/plugins/jdoom64/src/p_pspr.c	2008-07-11 13:22:36 UTC (rev 5832)
@@ -155,47 +155,6 @@
     P_SetPsprite(player, ps_weapon, wminfo->upState);
 }
 
-/**
- * Checks if the player has enough ammo to fire their readied weapon.
- * If not, a weapon change is instigated.
- *
- * @return              @c true, if there is enough ammo to fire.
- */
-boolean P_CheckAmmo(player_t *player)
-{
-    ammotype_t          i;
-    int                 count;
-    boolean             good;
-
-    // Check we have enough of ALL ammo types used by this weapon.
-    good = true;
-    for(i = 0; i < NUM_AMMO_TYPES && good; ++i)
-    {
-        if(!weaponInfo[player->readyWeapon][player->class].mode[0].ammoType[i])
-            continue; // Weapon does not take this type of ammo.
-
-        // Minimal amount for one shot varies.
-        count = weaponInfo[player->readyWeapon][player->class].mode[0].perShot[i];
-
-        // Return if current ammunition sufficient.
-        if(player->ammo[i] < count)
-        {
-            good = false;
-        }
-    }
-    if(good)
-        return true;
-
-    // Out of ammo, pick a weapon to change to.
-    P_MaybeChangeWeapon(player, WT_NOCHANGE, AT_NOAMMO, false);
-
-    // Now set appropriate weapon overlay.
-    if(player->pendingWeapon != WT_NOCHANGE)
-        P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
-
-    return false;
-}
-
 void P_FireWeapon(player_t *player)
 {
     statenum_t          newstate;

Modified: trunk/doomsday/plugins/jheretic/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jheretic/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
+++ trunk/doomsday/plugins/jheretic/src/p_pspr.c	2008-07-11 13:22:36 UTC (rev 5832)
@@ -776,53 +776,6 @@
     P_SetPsprite(player, ps_weapon, wminfo->upState);
 }
 
-/**
- * Returns true if there is enough ammo to shoot.  If not, selects the
- * next weapon to use.
- */
-boolean P_CheckAmmo(player_t *player)
-{
-    ammotype_t          i;
-    int                 count, lvl;
-    boolean             good;
-
-#if __JHERETIC__
-    if(player->powers[PT_WEAPONLEVEL2] && !deathmatch)
-        // If deathmatch always use level one ammo requirements.
-        lvl = 1;
-    else
-#endif
-        lvl = 0;
-
-    // Check we have enough of ALL ammo types used by this weapon.
-    good = true;
-    for(i = 0; i < NUM_AMMO_TYPES && good; ++i)
-    {
-        if(!weaponInfo[player->readyWeapon][player->class].mode[lvl].ammoType[i])
-            continue; // Weapon does not take this type of ammo.
-
-        // Minimal amount for one shot varies.
-        count = weaponInfo[player->readyWeapon][player->class].mode[lvl].perShot[i];
-
-        // Return if current ammunition sufficient.
-        if(player->ammo[i] < count)
-        {
-            good = false;
-        }
-    }
-
-    if(good)
-        return true;
-
-    // Out of ammo, pick a weapon to change to.
-    P_MaybeChangeWeapon(player, WT_NOCHANGE, AT_NOAMMO, false);
-
-    if(player->pendingWeapon != WT_NOCHANGE)
-        P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[lvl].downState);
-
-    return false;
-}
-
 void P_FireWeapon(player_t *player)
 {
     statenum_t          attackState;

Modified: trunk/doomsday/plugins/jhexen/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/jhexen/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
+++ trunk/doomsday/plugins/jhexen/src/p_pspr.c	2008-07-11 13:22:36 UTC (rev 5832)
@@ -491,56 +491,6 @@
     P_SetPsprite(plr, ps_weapon, newState);
 }
 
-/**
- * Checks if there is enough ammo to shoot with the current weapon. If not,
- * a weapon change event is dispatched (which may or may not do anything
- * depending on the player's config).
- *
- * @return              @c true, if there is enough mana to shoot.
- */
-boolean P_CheckAmmo(player_t *plr)
-{
-    ammotype_t  i;
-    int         count;
-    boolean     good;
-
-    //// \kludge Work around the multiple firing modes problems.
-    //// We need to split the weapon firing routines and implement them as
-    //// new fire modes.
-    if(plr->class == PCLASS_FIGHTER && plr->readyWeapon != WT_FOURTH)
-        return true;
-    // < KLUDGE
-
-    // Check we have enough of ALL ammo types used by this weapon.
-    good = true;
-
-    for(i = 0; i < NUM_AMMO_TYPES && good; ++i)
-    {
-        if(!weaponInfo[plr->readyWeapon][plr->class].mode[0].ammoType[i])
-            continue; // Weapon does not take this type of ammo.
-
-        // Minimal amount for one shot varies.
-        count = weaponInfo[plr->readyWeapon][plr->class].mode[0].perShot[i];
-
-        // Return if current ammunition sufficient.
-        if(plr->ammo[i] < count)
-        {
-            good = false;
-        }
-    }
-    if(good)
-        return true;
-
-    // Out of ammo, pick a weapon to change to.
-    P_MaybeChangeWeapon(plr, WT_NOCHANGE, AT_NOAMMO, false);
-
-    // Now set appropriate weapon overlay.
-    if(player->pendingWeapon != WT_NOCHANGE)
-        P_SetPsprite(plr, ps_weapon, weaponInfo[plr->readyWeapon][plr->class].mode[0].downState);
-
-    return false;
-}
-
 void P_FireWeapon(player_t *plr)
 {
     statenum_t attackState;

Modified: trunk/doomsday/plugins/wolftc/src/p_pspr.c
===================================================================
--- trunk/doomsday/plugins/wolftc/src/p_pspr.c	2008-07-11 12:15:57 UTC (rev 5831)
+++ trunk/doomsday/plugins/wolftc/src/p_pspr.c	2008-07-11 13:22:36 UTC (rev 5832)
@@ -155,45 +155,6 @@
     P_SetPsprite(player, ps_weapon, wminfo->upState);
 }
 
-/*
- * Returns true if there is enough ammo to shoot.
- * If not, selects the next weapon to use.
- */
-boolean P_CheckAmmo(player_t *player)
-{
-    ammotype_t i;
-    int     count;
-    boolean good;
-
-    // Check we have enough of ALL ammo types used by this weapon.
-    good = true;
-    for(i=0; i < NUM_AMMO_TYPES && good; ++i)
-    {
-        if(!weaponInfo[player->readyWeapon][player->class].mode[0].ammoType[i])
-            continue; // Weapon does not take this type of ammo.
-
-        // Minimal amount for one shot varies.
-        count = weaponInfo[player->readyWeapon][player->class].mode[0].perShot[i];
-
-        // Return if current ammunition sufficient.
-        if(player->ammo[i] < count)
-        {
-            good = false;
-        }
-    }
-    if(good)
-        return true;
-
-    // Out of ammo, pick a weapon to change to.
-    P_MaybeChangeWeapon(player, WT_NOCHANGE, AT_NOAMMO, false);
-
-    // Now set appropriate weapon overlay.
-    if(player->pendingWeapon != WT_NOCHANGE)
-        P_SetPsprite(player, ps_weapon, weaponInfo[player->readyWeapon][player->class].mode[0].downState);
-
-    return false;
-}
-
 void P_FireWeapon(player_t *player)
 {
     statenum_t newstate;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.