Fixed [DOOM,DOOM64]: Advancing the intermission did not work.

skyjake · Sep 16, 2011 · 1927bd3 · 1927bd3
1 parent 368a3b0
commit 1927bd3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 48 deletions.
diff --git a/doomsday/plugins/jdoom/src/wi_stuff.c b/doomsday/plugins/jdoom/src/wi_stuff.c
@@ -1226,37 +1226,34 @@ static void maybeAdvanceState(void)
 
         if(player->brain.attack)
         {
-            if(player->brain.attack)
+            if(!player->attackDown)
             {
-                if(!player->attackDown)
-                {
-                    if(IS_CLIENT)
-                        NetCl_PlayerActionRequest(player, GPA_FIRE, 0);
-                    else
-                        IN_SkipToNext();
-                }
-                player->attackDown = true;
-            }
-            else
-            {
-                player->attackDown = false;
+                if(IS_CLIENT)
+                    NetCl_PlayerActionRequest(player, GPA_FIRE, 0);
+                else
+                    IN_SkipToNext();
             }
+            player->attackDown = true;
+        }
+        else
+        {
+            player->attackDown = false;
+        }
 
-            if(player->brain.use)
-            {
-                if(!player->useDown)
-                {
-                    if(IS_CLIENT)
-                        NetCl_PlayerActionRequest(player, GPA_USE, 0);
-                    else
-                        IN_SkipToNext();
-                }
-                player->useDown = true;
-            }
-            else
+        if(player->brain.use)
+        {
+            if(!player->useDown)
             {
-                player->useDown = false;
+                if(IS_CLIENT)
+                    NetCl_PlayerActionRequest(player, GPA_USE, 0);
+                else
+                    IN_SkipToNext();
             }
+            player->useDown = true;
+        }
+        else
+        {
+            player->useDown = false;
         }
     }
 }

diff --git a/doomsday/plugins/jdoom64/src/wi_stuff.c b/doomsday/plugins/jdoom64/src/wi_stuff.c
@@ -889,33 +889,34 @@ static void maybeAdvanceState(void)
 
         if(player->brain.attack)
         {
-            if(player->brain.attack)
+            if(!player->attackDown)
             {
-                if(!player->attackDown)
-                {
-                    if(IS_CLIENT)
-                        NetCl_PlayerActionRequest(player, GPA_FIRE, 0);
-                    else
-                        IN_SkipToNext();
-                }
-                player->attackDown = true;
+                if(IS_CLIENT)
+                    NetCl_PlayerActionRequest(player, GPA_FIRE, 0);
+                else
+                    IN_SkipToNext();
             }
-            else
-                player->attackDown = false;
+            player->attackDown = true;
+        }
+        else
+        {
+            player->attackDown = false;
+        }
 
-            if(player->brain.use)
+        if(player->brain.use)
+        {
+            if(!player->useDown)
             {
-                if(!player->useDown)
-                {
-                    if(IS_CLIENT)
-                        NetCl_PlayerActionRequest(player, GPA_USE, 0);
-                    else
-                        IN_SkipToNext();
-                }
-                player->useDown = true;
+                if(IS_CLIENT)
+                    NetCl_PlayerActionRequest(player, GPA_USE, 0);
+                else
+                    IN_SkipToNext();
             }
-            else
-                player->useDown = false;
+            player->useDown = true;
+        }
+        else
+        {
+            player->useDown = false;
         }
     }
 }