Allow our own compiled QC

source/gl_model.c

@@ -1556,7 +1556,7 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype)
 			Mod_FloodFillSkin( skin, pheader->skinwidth, pheader->skinheight );
 
 			// save 8 bit texels for the player model to remap
-	//		if (!strcmp(loadmodel->name,"progs/player.mdl")) {
+	//		if (!strcmp(loadmodel->name,"models/player.mdl")) {
 				texels = Hunk_AllocName(s, loadname);
 				pheader->texels[i] = texels - (byte *)pheader;
 				memcpy (texels, (byte *)(pskintype + 1), s);

source/gl_rmain.c

@@ -505,7 +505,7 @@ void R_DrawAliasModel (entity_t *e)
 
 	// ZOID: never allow players to go totally black
 	i = currententity - cl_entities;
-	if (i >= 1 && i<=cl.maxclients /* && !strcmp (currententity->model->name, "progs/player.mdl") */)
+	if (i >= 1 && i<=cl.maxclients /* && !strcmp (currententity->model->name, "models/player.mdl") */)
 		if (ambientlight < 8)
 			ambientlight = shadelight = 8;
 
@@ -556,7 +556,7 @@ void R_DrawAliasModel (entity_t *e)
 	if (currententity->colormap != vid.colormap && !gl_nocolors.value)
 	{
 		i = currententity - cl_entities;
-		if (i >= 1 && i<=cl.maxclients /* && !strcmp (currententity->model->name, "progs/player.mdl") */)
+		if (i >= 1 && i<=cl.maxclients /* && !strcmp (currententity->model->name, "models/player.mdl") */)
 		    GL_Bind(playertextures - 1 + i);
 	}
 

source/host.c

@@ -70,7 +70,7 @@ cvar_t	noexit = {"noexit","0",false,true};
 #ifdef QUAKE2
 cvar_t	developer = {"developer","1"};	// should be 0 for release!
 #else
-cvar_t	developer = {"developer","0"};
+cvar_t	developer = {"developer","1"};
 #endif
 
 cvar_t	skill = {"skill","1"};						// 0 - 3

source/pr_edict.c

@@ -1007,7 +1007,7 @@ void PR_LoadProgs (void)
 	if (progs->version != PROG_VERSION)
 		Sys_Error ("progs.dat has wrong version number (%i should be %i)", progs->version, PROG_VERSION);
 	if (progs->crc != PROGHEADER_CRC)
-		Sys_Error ("progs.dat system vars have been modified, progdefs.h is out of date");
+		Con_Printf ("progs.dat system vars have been modified, progdefs.h is out of date\n");
 
 	pr_functions = (dfunction_t *)((byte *)progs + progs->ofs_functions);
 	pr_strings = (char *)progs + progs->ofs_strings;

source/progdefs.h

@@ -17,8 +17,147 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#ifdef QUAKE2
-#include "progdefs.q2"
-#else
-#include "progdefs.q1"
-#endif
+
+
+/* file generated by qcc, do not modify */
+
+typedef struct
+{	int	pad[28];
+	int	self;
+	int	other;
+	int	world;
+	float	time;
+	float	frametime;
+	float	force_retouch;
+	string_t	mapname;
+	float	deathmatch;
+	float	coop;
+	float	teamplay;
+	float	serverflags;
+	float	total_secrets;
+	float	total_monsters;
+	float	found_secrets;
+	float	killed_monsters;
+	float	parm1;
+	float	parm2;
+	float	parm3;
+	float	parm4;
+	float	parm5;
+	float	parm6;
+	float	parm7;
+	float	parm8;
+	float	parm9;
+	float	parm10;
+	float	parm11;
+	float	parm12;
+	float	parm13;
+	float	parm14;
+	float	parm15;
+	float	parm16;
+	vec3_t	v_forward;
+	vec3_t	v_up;
+	vec3_t	v_right;
+	float	trace_allsolid;
+	float	trace_startsolid;
+	float	trace_fraction;
+	vec3_t	trace_endpos;
+	vec3_t	trace_plane_normal;
+	float	trace_plane_dist;
+	int	trace_ent;
+	float	trace_inopen;
+	float	trace_inwater;
+	int	msg_entity;
+	func_t	main;
+	func_t	StartFrame;
+	func_t	PlayerPreThink;
+	func_t	PlayerPostThink;
+	func_t	ClientKill;
+	func_t	ClientConnect;
+	func_t	PutClientInServer;
+	func_t	ClientDisconnect;
+	func_t	SetNewParms;
+	func_t	SetChangeParms;
+} globalvars_t;
+
+typedef struct
+{
+	float	modelindex;
+	vec3_t	absmin;
+	vec3_t	absmax;
+	float	ltime;
+	float	movetype;
+	float	solid;
+	vec3_t	origin;
+	vec3_t	oldorigin;
+	vec3_t	velocity;
+	vec3_t	angles;
+	vec3_t	avelocity;
+	vec3_t	punchangle;
+	string_t	classname;
+	string_t	model;
+	float	frame;
+	float	skin;
+	float	effects;
+	vec3_t	mins;
+	vec3_t	maxs;
+	vec3_t	size;
+	func_t	touch;
+	func_t	use;
+	func_t	think;
+	func_t	blocked;
+	float	nextthink;
+	int	groundentity;
+	float	health;
+	float	frags;
+	float	weapon;
+	string_t	weaponmodel;
+	float	weaponframe;
+	float	currentammo;
+	float	ammo_shells;
+	float	ammo_nails;
+	float	ammo_rockets;
+	float	ammo_cells;
+	float	items;
+	float	takedamage;
+	int	chain;
+	float	deadflag;
+	vec3_t	view_ofs;
+	float	button0;
+	float	button1;
+	float	button2;
+	float	impulse;
+	float	fixangle;
+	vec3_t	v_angle;
+	float	idealpitch;
+	string_t	netname;
+	int	enemy;
+	float	flags;
+	float	colormap;
+	float	team;
+	float	max_health;
+	float	teleport_time;
+	float	armortype;
+	float	armorvalue;
+	float	waterlevel;
+	float	watertype;
+	float	ideal_yaw;
+	float	yaw_speed;
+	int	aiment;
+	int	goalentity;
+	float	spawnflags;
+	string_t	target;
+	string_t	targetname;
+	float	dmg_take;
+	float	dmg_save;
+	int	dmg_inflictor;
+	int	owner;
+	vec3_t	movedir;
+	string_t	message;
+	float	sounds;
+	string_t	noise;
+	string_t	noise1;
+	string_t	noise2;
+	string_t	noise3;
+} entvars_t;
+
+#define PROGHEADER_CRC 5927

source/progdefs.q1

@@ -1,143 +0,0 @@
-
-/* file generated by qcc, do not modify */
-
-typedef struct
-{	int	pad[28];
-	int	self;
-	int	other;
-	int	world;
-	float	time;
-	float	frametime;
-	float	force_retouch;
-	string_t	mapname;
-	float	deathmatch;
-	float	coop;
-	float	teamplay;
-	float	serverflags;
-	float	total_secrets;
-	float	total_monsters;
-	float	found_secrets;
-	float	killed_monsters;
-	float	parm1;
-	float	parm2;
-	float	parm3;
-	float	parm4;
-	float	parm5;
-	float	parm6;
-	float	parm7;
-	float	parm8;
-	float	parm9;
-	float	parm10;
-	float	parm11;
-	float	parm12;
-	float	parm13;
-	float	parm14;
-	float	parm15;
-	float	parm16;
-	vec3_t	v_forward;
-	vec3_t	v_up;
-	vec3_t	v_right;
-	float	trace_allsolid;
-	float	trace_startsolid;
-	float	trace_fraction;
-	vec3_t	trace_endpos;
-	vec3_t	trace_plane_normal;
-	float	trace_plane_dist;
-	int	trace_ent;
-	float	trace_inopen;
-	float	trace_inwater;
-	int	msg_entity;
-	func_t	main;
-	func_t	StartFrame;
-	func_t	PlayerPreThink;
-	func_t	PlayerPostThink;
-	func_t	ClientKill;
-	func_t	ClientConnect;
-	func_t	PutClientInServer;
-	func_t	ClientDisconnect;
-	func_t	SetNewParms;
-	func_t	SetChangeParms;
-} globalvars_t;
-
-typedef struct
-{
-	float	modelindex;
-	vec3_t	absmin;
-	vec3_t	absmax;
-	float	ltime;
-	float	movetype;
-	float	solid;
-	vec3_t	origin;
-	vec3_t	oldorigin;
-	vec3_t	velocity;
-	vec3_t	angles;
-	vec3_t	avelocity;
-	vec3_t	punchangle;
-	string_t	classname;
-	string_t	model;
-	float	frame;
-	float	skin;
-	float	effects;
-	vec3_t	mins;
-	vec3_t	maxs;
-	vec3_t	size;
-	func_t	touch;
-	func_t	use;
-	func_t	think;
-	func_t	blocked;
-	float	nextthink;
-	int	groundentity;
-	float	health;
-	float	frags;
-	float	weapon;
-	string_t	weaponmodel;
-	float	weaponframe;
-	float	currentammo;
-	float	ammo_shells;
-	float	ammo_nails;
-	float	ammo_rockets;
-	float	ammo_cells;
-	float	items;
-	float	takedamage;
-	int	chain;
-	float	deadflag;
-	vec3_t	view_ofs;
-	float	button0;
-	float	button1;
-	float	button2;
-	float	impulse;
-	float	fixangle;
-	vec3_t	v_angle;
-	float	idealpitch;
-	string_t	netname;
-	int	enemy;
-	float	flags;
-	float	colormap;
-	float	team;
-	float	max_health;
-	float	teleport_time;
-	float	armortype;
-	float	armorvalue;
-	float	waterlevel;
-	float	watertype;
-	float	ideal_yaw;
-	float	yaw_speed;
-	int	aiment;
-	int	goalentity;
-	float	spawnflags;
-	string_t	target;
-	string_t	targetname;
-	float	dmg_take;
-	float	dmg_save;
-	int	dmg_inflictor;
-	int	owner;
-	vec3_t	movedir;
-	string_t	message;
-	float	sounds;
-	string_t	noise;
-	string_t	noise1;
-	string_t	noise2;
-	string_t	noise3;
-} entvars_t;
-
-#define PROGHEADER_CRC 5927

source/progdefs.q2

@@ -1,158 +0,0 @@
-
-/* file generated by qcc, do not modify */
-
-typedef struct
-{	int	pad[28];
-	int	self;
-	int	other;
-	int	world;
-	float	time;
-	float	frametime;
-	float	force_retouch;
-	string_t	mapname;
-	string_t	startspot;
-	float	deathmatch;
-	float	coop;
-	float	teamplay;
-	float	serverflags;
-	float	total_secrets;
-	float	total_monsters;
-	float	found_secrets;
-	float	killed_monsters;
-	float	parm1;
-	float	parm2;
-	float	parm3;
-	float	parm4;
-	float	parm5;
-	float	parm6;
-	float	parm7;
-	float	parm8;
-	float	parm9;
-	float	parm10;
-	float	parm11;
-	float	parm12;
-	float	parm13;
-	float	parm14;
-	float	parm15;
-	float	parm16;
-	vec3_t	v_forward;
-	vec3_t	v_up;
-	vec3_t	v_right;
-	float	trace_allsolid;
-	float	trace_startsolid;
-	float	trace_fraction;
-	vec3_t	trace_endpos;
-	vec3_t	trace_plane_normal;
-	float	trace_plane_dist;
-	int	trace_ent;
-	float	trace_inopen;
-	float	trace_inwater;
-	int	msg_entity;
-	string_t	null;
-	func_t	main;
-	func_t	StartFrame;
-	func_t	PlayerPreThink;
-	func_t	PlayerPostThink;
-	func_t	ClientKill;
-	func_t	ClientConnect;
-	func_t	PutClientInServer;
-	func_t	ClientDisconnect;
-	func_t	SetNewParms;
-	func_t	SetChangeParms;
-} globalvars_t;
-
-typedef struct
-{
-	float	modelindex;
-	vec3_t	absmin;
-	vec3_t	absmax;
-	float	ltime;
-	float	movetype;
-	float	solid;
-	vec3_t	origin;
-	vec3_t	oldorigin;
-	vec3_t	velocity;
-	vec3_t	angles;
-	vec3_t	avelocity;
-	vec3_t	basevelocity;
-	vec3_t	punchangle;
-	string_t	classname;
-	string_t	model;
-	float	frame;
-	float	skin;
-	float	effects;
-	float	drawPercent;
-	float	gravity;
-	float	mass;
-	float	light_level;
-	vec3_t	mins;
-	vec3_t	maxs;
-	vec3_t	size;
-	func_t	touch;
-	func_t	use;
-	func_t	think;
-	func_t	blocked;
-	float	nextthink;
-	int	groundentity;
-	float	health;
-	float	frags;
-	float	weapon;
-	string_t	weaponmodel;
-	float	weaponframe;
-	float	currentammo;
-	float	ammo_shells;
-	float	ammo_nails;
-	float	ammo_rockets;
-	float	ammo_cells;
-	float	items;
-	float	items2;
-	float	takedamage;
-	int	chain;
-	float	deadflag;
-	vec3_t	view_ofs;
-	float	button0;
-	float	button1;
-	float	button2;
-	float	impulse;
-	float	fixangle;
-	vec3_t	v_angle;
-	float	idealpitch;
-	float	pitch_speed;
-	string_t	netname;
-	int	enemy;
-	float	flags;
-	float	colormap;
-	float	team;
-	float	max_health;
-	float	teleport_time;
-	float	armortype;
-	float	armorvalue;
-	float	waterlevel;
-	float	watertype;
-	float	ideal_yaw;
-	float	yaw_speed;
-	int	aiment;
-	int	goalentity;
-	float	spawnflags;
-	string_t	target;
-	string_t	targetname;
-	float	dmg_take;
-	float	dmg_save;
-	int	dmg_inflictor;
-	int	owner;
-	vec3_t	movedir;
-	string_t	message;
-	float	sounds;
-	string_t	noise;
-	string_t	noise1;
-	string_t	noise2;
-	string_t	noise3;
-	float	dmg;
-	float	dmgtime;
-	float	air_finished;
-	float	pain_finished;
-	float	radsuit_finished;
-	float	speed;
-} entvars_t;
-
-#define PROGHEADER_CRC 31586

source/sv_main.c

@@ -947,7 +947,7 @@ void SV_CreateBaseline (void)
 		if (entnum > 0 && entnum <= svs.maxclients)
 		{
 			svent->baseline.colormap = entnum;
-			svent->baseline.modelindex = SV_ModelIndex("progs/player.mdl");
+			svent->baseline.modelindex = SV_ModelIndex("models/player.mdl");
 		}
 		else
 		{