diff --git a/hyper.h b/hyper.h index 13edeec5..1554f8e9 100644 --- a/hyper.h +++ b/hyper.h @@ -212,7 +212,7 @@ namespace multi { int deadzoneval[MAXJOY][MAXAXE]; }; - multi::config scfg; + extern config scfg; } enum eStereo { sOFF, sAnaglyph, sLR, sODS }; @@ -5493,7 +5493,7 @@ namespace dual { // 0 = dualmode off, 1 = in dualmode (no game chosen), 2 = in dualmode (working on one of subgames) extern int state; extern int currently_loaded, main_side; - bool affect_both; + extern bool affect_both; bool movepc(int d, int subdir, bool checkonly); extern transmatrix player_orientation[2]; diff --git a/multigame.cpp b/multigame.cpp index f2bcc601..816e4f00 100644 --- a/multigame.cpp +++ b/multigame.cpp @@ -77,6 +77,7 @@ namespace dual { int currently_loaded; int main_side; + bool affect_both; gamedata dgd[2]; transmatrix player_orientation[2]; diff --git a/shmup.cpp b/shmup.cpp index 992c43e9..2a432c2d 100644 --- a/shmup.cpp +++ b/shmup.cpp @@ -24,6 +24,7 @@ namespace shmupballs { namespace multi { + config scfg; charstyle scs[MAXPLAYER]; int players = 1;