diff --suppress-common-lines -Naur qrack-1.60.1-src/cl_main.c qrack-1.60.2-src/cl_main.c --- qrack-1.60.1-src/cl_main.c 2006-11-02 07:37:15.000000000 +0000 +++ qrack-1.60.2-src/cl_main.c 2010-08-20 20:50:50.000003307 +0000 @@ -812,12 +812,12 @@ // rotate binary objects locally if (ent->model->flags & EF_ROTATE) { - if ((ent->model != cl.model_precache[cl_modelindex[mi_flag]]) && (ent->model != cl.model_precache[cl_modelindex[mi_w_s_key]]) && (ent->model != cl.model_precache[cl_modelindex[mi_w_g_key]])) //R00k dont rotate flags! +/* if ((ent->model != cl.model_precache[cl_modelindex[mi_flag]]) && (ent->model != cl.model_precache[cl_modelindex[mi_w_s_key]]) && (ent->model != cl.model_precache[cl_modelindex[mi_w_g_key]])) //R00k dont rotate flags! { ent->angles[1] = bobjrotate; if (cl_bobbing.value) ent->origin[2] += sin(bobjrotate / 90 * M_PI) * 5 + 5; - } + }*/ } // EF_BRIGHTFIELD is not used by original progs diff --suppress-common-lines -Naur qrack-1.60.1-src/cmdhist.dat qrack-1.60.2-src/cmdhist.dat --- qrack-1.60.1-src/cmdhist.dat 1970-01-01 00:00:00.000000000 +0000 +++ qrack-1.60.2-src/cmdhist.dat 2010-08-20 20:51:03.330128307 +0000 @@ -0,0 +1 @@ +]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] \ No newline at end of file diff --suppress-common-lines -Naur qrack-1.60.1-src/host_cmd.c qrack-1.60.2-src/host_cmd.c --- qrack-1.60.1-src/host_cmd.c 2006-07-07 19:53:40.000000000 +0000 +++ qrack-1.60.2-src/host_cmd.c 2010-08-20 20:39:36.996012787 +0000 @@ -747,7 +747,7 @@ Con_Printf ("%s renamed to %s\n", host_client->name, newName); Q_strcpy (host_client->name, newName); - host_client->edict->v.netname = host_client->name - pr_strings; + host_client->edict->v.netname = PR_SetString (host_client->name); // JPG 1.05 - log the IP address if (sscanf(host_client->netconnection->address, "%d.%d.%d", &a, &b, &c) == 3) @@ -1091,7 +1091,7 @@ memset (&ent->v, 0, progs->entityfields * 4); ent->v.colormap = NUM_FOR_EDICT(ent); ent->v.team = (host_client->colors & 15) + 1; - ent->v.netname = host_client->name - pr_strings; + ent->v.netname = PR_SetString (host_client->name); // copy spawn parms out of the client_t for (i=0 ; iv.model = m - pr_strings; + e->v.model = PR_SetString (m); e->v.modelindex = i; //SV_ModelIndex (m); mod = sv.models[(int)e->v.modelindex]; // Mod_ForName (m, true); @@ -877,7 +877,7 @@ sprintf (pr_string_temp, "%d",(int)v); else sprintf (pr_string_temp, "%5.1f",v); - G_INT(OFS_RETURN) = pr_string_temp - pr_strings; + G_INT(OFS_RETURN) = PR_SetTmpString (pr_string_temp); } void PF_fabs (void) @@ -890,13 +890,13 @@ void PF_vtos (void) { sprintf (pr_string_temp, "'%5.1f %5.1f %5.1f'", G_VECTOR(OFS_PARM0)[0], G_VECTOR(OFS_PARM0)[1], G_VECTOR(OFS_PARM0)[2]); - G_INT(OFS_RETURN) = pr_string_temp - pr_strings; + G_INT(OFS_RETURN) = PR_SetTmpString (pr_string_temp); } void PF_etos (void) { sprintf (pr_string_temp, "entity %i", G_EDICTNUM(OFS_PARM0)); - G_INT(OFS_RETURN) = pr_string_temp - pr_strings; + G_INT(OFS_RETURN) = PR_SetTmpString (pr_string_temp); } void PF_Spawn (void) diff --suppress-common-lines -Naur qrack-1.60.1-src/pr_edict.c qrack-1.60.2-src/pr_edict.c --- qrack-1.60.1-src/pr_edict.c 2006-11-01 14:24:20.000000000 +0000 +++ qrack-1.60.2-src/pr_edict.c 2010-08-20 20:41:09.609005707 +0000 @@ -752,7 +752,7 @@ switch (key->type & ~DEF_SAVEGLOBAL) { case ev_string: - *(string_t *)d = ED_NewString (s) - pr_strings; + *(string_t *)d = PR_SetString (ED_NewString (s)); break; case ev_float: diff --suppress-common-lines -Naur qrack-1.60.1-src/pr_exec.c qrack-1.60.2-src/pr_exec.c --- qrack-1.60.1-src/pr_exec.c 2005-05-21 20:36:46.000000000 +0000 +++ qrack-1.60.2-src/pr_exec.c 2010-08-20 20:36:24.839276027 +0000 @@ -135,6 +135,44 @@ char *PR_GlobalString (int ofs); char *PR_GlobalStringNoContents (int ofs); +#define MAX_PRSTR 1024 +char *pr_strtbl[MAX_PRSTR]; +int num_prstr; + +char *PR_GetString (int num) { + if (num < 0) + return pr_strtbl[-num]; + return pr_strings + num; +} + +int PR_SetString (char *s) { + int i; + + if (s - pr_strings < 0) { + for (i = 0; i <= num_prstr; i++) { + if (pr_strtbl[i] == s) + break; + } + if (i < num_prstr) + return -i; + if (num_prstr == MAX_PRSTR - 1) + Sys_Error ("MAX_PRSTR"); + num_prstr++; + pr_strtbl[num_prstr] = s; + return -num_prstr; + } + return (int) (s - pr_strings); +} + +int PR_SetTmpString (char *s) { + static int index1; + static char tmp[8][2048]; + + index1 = (index1 + 1) & 7; + + Q_strcpy (tmp[index1], s); + return PR_SetString (tmp[index1]); +} //============================================================================= @@ -490,7 +528,7 @@ (a->vector[2] == b->vector[2]); break; case OP_EQ_S: - c->_float = !strcmp(pr_strings+a->string,pr_strings+b->string); + c->_float = !strcmp(PR_GetString (a->string), PR_GetString (b->string)); break; case OP_EQ_E: c->_float = a->_int == b->_int; diff --suppress-common-lines -Naur qrack-1.60.1-src/progs.h qrack-1.60.2-src/progs.h --- qrack-1.60.1-src/progs.h 2005-04-24 16:58:50.000000000 +0000 +++ qrack-1.60.2-src/progs.h 2010-08-20 20:33:46.223275587 +0000 @@ -120,6 +120,10 @@ #define E_VECTOR(e,o) (&((float*)&e->v)[o]) #define E_STRING(e,o) (pr_strings + *(string_t *)&((float*)&e->v)[o]) +char *PR_GetString (int num); +int PR_SetString (char *s); +int PR_SetTmpString (char *s); + extern int type_size[8]; typedef void (*builtin_t) (void); diff --suppress-common-lines -Naur qrack-1.60.1-src/sv_main.c qrack-1.60.2-src/sv_main.c --- qrack-1.60.1-src/sv_main.c 2006-07-07 20:05:38.000000000 +0000 +++ qrack-1.60.2-src/sv_main.c 2010-08-20 20:42:44.271275587 +0000 @@ -1134,7 +1134,7 @@ ent = EDICT_NUM(0); memset (&ent->v, 0, progs->entityfields * 4); ent->free = false; - ent->v.model = sv.worldmodel->name - pr_strings; + ent->v.model = PR_SetString (sv.worldmodel->name); ent->v.modelindex = 1; // world model ent->v.solid = SOLID_BSP; ent->v.movetype = MOVETYPE_PUSH; @@ -1144,7 +1144,7 @@ else pr_global_struct->deathmatch = deathmatch.value; - pr_global_struct->mapname = sv.name - pr_strings; + pr_global_struct->mapname = PR_SetString (sv.name); // serverflags are for cross level information (sigils) pr_global_struct->serverflags = svs.serverflags;