foxygit / doom Log in
commit 18e2e3f73e00447b013583415a0423f09b2b0af0
Author:     Samuel Villareal <svkaiser@gmail.com>
AuthorDate: Sun Sep 12 00:36:52 2010 +0000
Commit:     Samuel Villareal <svkaiser@gmail.com>
CommitDate: Sun Sep 12 00:36:52 2010 +0000

    + externalized isregistered
    + Swapped out gamemode with isregistered check in P_InitSwitches

    Subversion-branch: /branches/strife-branch
    Subversion-revision: 2068
---
 src/strife/d_main.h   | 1 +
 src/strife/p_switch.c | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/strife/d_main.h b/src/strife/d_main.h
index a1770536..985bb66c 100644
--- a/src/strife/d_main.h
+++ b/src/strife/d_main.h
@@ -52,6 +52,7 @@ void D_StartTitle (void);
 //

 extern  gameaction_t    gameaction;
+extern  boolean         isregistered;   // villsa [STRIFE]


 #endif
diff --git a/src/strife/p_switch.c b/src/strife/p_switch.c
index 49e52760..0e1da1e8 100644
--- a/src/strife/p_switch.c
+++ b/src/strife/p_switch.c
@@ -33,7 +33,7 @@
 #include "p_local.h"

 #include "g_game.h"
-
+#include "d_main.h" // villsa [STRIFE]
 #include "s_sound.h"

 // Data.
@@ -139,9 +139,8 @@ void P_InitSwitchList(void)

     episode = 1;

-    // STRIFE-FIXME: Needs to test isregistered variable
-    if(gamemode == registered)
-            episode = 2;
+    if(isregistered)
+        episode = 2;
     // villsa [STRIFE] unused
     /*else
 	if ( gamemode == commercial )