Fix GAME_XONOTIC beging misplaced in gamemode_t->gamemode_info causing "gamemode...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10478 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4f738fb758eadca11d76db88b8db2e2d45f9e261

diff --git a/common.h b/common.h
index 4e57f2f7286847a314dc5ad6da1c34a4948795e9..104521fbf2b84b1951ee8bc5773f903e38a1edab 100644 (file)
--- a/common.h
+++ b/common.h
@@ -252,6 +252,7 @@ typedef enum gamemode_e
        GAME_ROGUE,
        GAME_NEHAHRA,
        GAME_NEXUIZ,
+       GAME_XONOTIC,
        GAME_TRANSFUSION,
        GAME_GOODVSBAD2,
        GAME_TEU,
@@ -273,7 +274,6 @@ typedef enum gamemode_e
        GAME_BLOODOMNICIDE,
        GAME_STEELSTORM, // added by motorsep
        GAME_STRAPBOMB, // added by motorsep for Urre
-       GAME_XONOTIC,
        GAME_COUNT
 }
 gamemode_t;

diff --git a/csprogs.c b/csprogs.c
index 1ebf6738a3e3be6154f2d3e311fecb85c95cc8e0..8aac1a184020018c44f3ed34f0e533f3111b2053 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -123,6 +123,10 @@ static void CSQC_SetGlobals (void)
 
                if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_angles)))
                        VectorCopy(cl.viewangles, val->vector);
+               if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_punchangle)))
+                       VectorCopy(cl.punchangle, val->vector);
+               if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_punchvector)))
+                       VectorCopy(cl.punchvector, val->vector);
                prog->globals.client->maxclients = cl.maxclients;
        CSQC_END
 }

diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc
index 2c2d0d1ab1545647bc453d27613dcf854ecc6ea4..1a6847fc1e0aa3feefb27de90dada3738a8426a6 100644 (file)
--- a/dpdefs/csprogsdefs.qc
+++ b/dpdefs/csprogsdefs.qc
@@ -147,6 +147,10 @@ void               end_sys_fields;                 // flag for structure dumping
 // Additional OPTIONAL Fields and Globals
 float          intermission;
 
+vector         view_angles; // same as input_angles
+vector         view_punchangle;
+vector         view_punchvector;
+
 /*
 ==============================================================================
 

diff --git a/progsvm.h b/progsvm.h
index 087972ed3b204ef0b31afcf6151bfb15b3e72e02..53eb4d3154bd25c483689efacb3ed71624550293 100644 (file)
--- a/progsvm.h
+++ b/progsvm.h
@@ -288,6 +288,8 @@ typedef struct prvm_prog_globaloffsets_s
        int v_right; // ssqc / csqc
        int v_up; // ssqc / csqc
        int view_angles; // csqc
+       int view_punchangle; // csqc
+       int view_punchvector; // csqc
        int trace_allsolid; // ssqc / csqc
        int trace_startsolid; // ssqc / csqc
        int trace_fraction; // ssqc / csqc

diff --git a/prvm_edict.c b/prvm_edict.c
index b30374f7e1a401b06987ed479ecb49fb99b8fae3..d93e979616b823c3f5b9f9ca84f199c5535fbff2 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -1730,6 +1730,8 @@ void PRVM_FindOffsets(void)
        prog->globaloffsets.v_right                       = PRVM_ED_FindGlobalOffset("v_right");
        prog->globaloffsets.v_up                          = PRVM_ED_FindGlobalOffset("v_up");
        prog->globaloffsets.view_angles                   = PRVM_ED_FindGlobalOffset("view_angles");
+       prog->globaloffsets.view_punchangle               = PRVM_ED_FindGlobalOffset("view_punchangle");
+       prog->globaloffsets.view_punchvector              = PRVM_ED_FindGlobalOffset("view_punchvector");
        prog->globaloffsets.worldstatus                   = PRVM_ED_FindGlobalOffset("worldstatus");
        prog->globaloffsets.particles_alphamin            = PRVM_ED_FindGlobalOffset("particles_alphamin");
        prog->globaloffsets.particles_alphamax            = PRVM_ED_FindGlobalOffset("particles_alphamax");