Small building adjustment to the mod progs.src and Makefiles.

Changed some client progs function names for readability, more to come

base/src/client/cmds.qc

@@ -17,7 +17,7 @@
 /* This is where custom game-specific commands go!
  * You'll also inherit all the commands defined in entry.c */
 int
-Game_ConsoleCommand(void)
+ClientGame_ConsoleCommand(void)
 {
 	switch(argv(0)) {
 		default:

base/src/client/entities.qc

@@ -15,7 +15,7 @@
  */
 
 int
-Game_Entity_Update(float id, float new)
+ClientGame_EntityUpdate(float id, float new)
 {
 	switch (id) {
 	default:

base/src/client/game_event.qc

@@ -15,7 +15,7 @@
  */
 
 void
-Game_Parse_Event(float fHeader)
+ClientGame_EventParse(float fHeader)
 {
 	switch (fHeader) {
 	case EV_CHAT:

base/src/client/init.qc

@@ -16,22 +16,22 @@
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 }

base/src/client/modelevent.qc

@@ -15,7 +15,7 @@
  */
 
 void
-Game_ClientModelEvent(float flTimeStamp, int iCode, string strData)
+ClientGame_ModelEvent(float flTimeStamp, int iCode, string strData)
 {
 	switch (iCode) {
 	default:

base/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../../csprogs.dat"
 
 #define CSQC
 #define CLIENT

base/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER

cstrike.fmf

@@ -26,6 +26,7 @@ BASEGAME cstrike
 -set gameinfo_menutrack ""
 -set gameinfo_chatroom "freecs"
 -set gameinfo_pkgname "cg_cstrike valve_uplink valve_realmedia valve_patch1110 valve_opfordemo valve_hlds logos_realmedia valve_dayone"
+-set gameinfo_pkgfile "n0th1ng.wad"
 
 DOWNLOADSURL http://www.frag-net.com/dl/valve_packages
 UPDATEURL http://www.frag-net.com/mods/cstrike.fmf

cstrike/src/client/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../data.pk3dir
 	$(CC) progs.src

cstrike/src/client/cmds.qc

@@ -15,7 +15,7 @@
  */
 
 int
-Game_ConsoleCommand(void)
+ClientGame_ConsoleCommand(void)
 {
 	switch(argv(0)) {
 	case "chooseteam":

cstrike/src/client/entities.qc

@@ -15,7 +15,7 @@
  */
 
 int
-Game_Entity_Update(float id, float new)
+ClientGame_EntityUpdate(float id, float new)
 {
 	switch (id) {
 	case ENT_C4BOMB:

cstrike/src/client/game_event.qc

@@ -15,7 +15,7 @@
  */
 
 void
-Game_Parse_Event(float fHeader)
+ClientGame_EventParse(float fHeader)
 {
 switch (fHeader) {
 	case EV_OBITUARY:

cstrike/src/client/init.qc

@@ -16,13 +16,13 @@
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 	registercommand("chooseteam");
 	registercommand("buy");
@@ -110,13 +110,13 @@ Client_Init(float apilevel, string enginename, float engineversion)
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 	Textmenu_Call("TEAM_SELECT");
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 	g_cs_cross = spriteframe("sprites/crosshairs.spr", 0, 0.0f);
 	g_cs_scope0 = spriteframe("sprites/sniper_scope.spr", 0, 0.0f);

cstrike/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../../csprogs.dat"
 #pragma includedir "../../../valve/src"
 
 #define CSQC

cstrike/src/client/radio.qc

@@ -124,7 +124,12 @@ void
 Radio_PlayMessage(float fMessage)
 {
 	sound(world, CHAN_VOICE, g_cstrikeRadioWAVs[fMessage], 1, ATTN_NONE, 0, SOUNDFLAG_NOSPACIALISE);
-	CSQC_Parse_Print(sprintf("^2[RADIO]^xF80: %s", g_cstrikeRadioChat[fMessage]), PRINT_CHAT);
+
+	if (fMessage == RADIO_CTWIN || fMessage == RADIO_TERWIN || fMessage == RADIO_ROUNDDRAW) {
+		CSQC_Parse_CenterPrint(sprintf("%s", g_cstrikeRadioChat[fMessage]));
+	} else {
+		CSQC_Parse_Print(sprintf("^2[RADIO]^xF80: %s", g_cstrikeRadioChat[fMessage]), PRINT_CHAT);
+	}
 }
 
 /*

cstrike/src/server/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../data.pk3dir
 	$(CC) progs.src

cstrike/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER

cstrike/src/shared/w_glock18.qc

@@ -313,7 +313,7 @@ w_glock18_hudpic(int selected, vector pos, float a)
 weapon_t w_glock18 =
 {
 	.name		= "glock18",
-	.id			= ITEM_GLOCK18,
+	.id		= ITEM_GLOCK18,
 	.slot		= 1,
 	.slot_pos	= 1,
 	.allow_drop	= TRUE,

gearbox/src/client/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../gearbox/data.pk3dir
 	$(CC) progs.src

gearbox/src/client/init.qc

@@ -19,24 +19,24 @@ float(entity foo, float chanid) getchannellevel = #0;
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 	Obituary_Init();
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 	Obituary_Precache();
 

gearbox/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../../csprogs.dat"
 
 #define CSQC
 #define CLIENT

gearbox/src/server/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../gearbox/data.pk3dir
 	$(CC) progs.src

gearbox/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER

hunger/src/client/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../hunger/data.pk3dir
 	$(CC) progs.src

hunger/src/client/init.qc

@@ -19,24 +19,24 @@ float(entity foo, float chanid) getchannellevel = #0;
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 	Obituary_Init();
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 	Obituary_Precache();
 

hunger/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../../csprogs.dat"
 
 #define CSQC
 #define CLIENT

hunger/src/server/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../hunger/data.pk3dir
 	$(CC) progs.src

hunger/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER

poke646/src/client/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../poke646/data.pk3dir
 	$(CC) progs.src

poke646/src/client/entities.qc

@@ -15,7 +15,7 @@
  */
 
 int
-Game_Entity_Update(float id, float new)
+ClientGame_EntityUpdate(float id, float new)
 {
 	switch (id) {
 	default:

poke646/src/client/init.qc

@@ -19,24 +19,24 @@ float(entity foo, float chanid) getchannellevel = #0;
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 	Obituary_Init();
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 	Obituary_Precache();
 

poke646/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../../csprogs.dat"
 
 #define CSQC
 #define CLIENT

poke646/src/server/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../poke646/data.pk3dir
 	$(CC) progs.src

poke646/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER

rewolf/src/client/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../rewolf/data.pk3dir
 	$(CC) progs.src

rewolf/src/client/entities.qc

@@ -15,7 +15,7 @@
  */
 
 int
-Game_Entity_Update(float id, float new)
+ClientGame_EntityUpdate(float id, float new)
 {
 	switch (id) {
 	default:

rewolf/src/client/init.qc

@@ -16,24 +16,24 @@
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 	Obituary_Init();
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 	Obituary_Precache();
 

rewolf/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../../csprogs.dat"
 
 #define CSQC
 #define CLIENT

rewolf/src/server/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../rewolf/data.pk3dir
 	$(CC) progs.src

rewolf/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER

scihunt/src/client/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../scihunt/data.pk3dir
 	$(CC) progs.src

scihunt/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../../csprogs.dat"
 
 #define CSQC
 #define CLIENT

scihunt/src/server/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../scihunt/data.pk3dir
 	$(CC) progs.src

scihunt/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER

src/client/defs.h

@@ -91,7 +91,7 @@ void View_PlayAnimation(int);
 void View_PlayAnimation(int);
 void Vox_Play(string);
 void Event_ProcessModel(float, int, string);
-void Game_ClientModelEvent(float, int, string);
+void ClientGame_ModelEvent(float, int, string);
 
 /* this really should be done in-engine */
 

src/client/entry.qc

@@ -85,7 +85,7 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
 	VGUI_Init();
 
 	/* Game specific inits */
-	Client_Init(apilevel, enginename, engineversion);
+	ClientGame_Init(apilevel, enginename, engineversion);
 	DSP_Init();
 	CSQC_RendererRestarted("init");
 	Titles_Init();
@@ -121,7 +121,7 @@ CSQC_RendererRestarted(string rstr)
 	Weapons_Init();
 	Scores_Init();
 	View_Init();
-	Game_RendererRestarted(rstr);
+	ClientGame_RendererRestart(rstr);
 	HUD_Init();
 
 	/* GS-Entbase */
@@ -154,7 +154,7 @@ CSQC_UpdateView(float w, float h, float focus)
 		if (!video_res[0] && !video_res[1]) {
 			video_res[0] = w;
 			video_res[1] = h;
-			Client_InitDone();
+			ClientGame_InitDone();
 		}
 	}
 
@@ -178,7 +178,7 @@ CSQC_UpdateView(float w, float h, float focus)
 		setproperty(VF_ORIGIN, g_vecCubePos);
 		setproperty(VF_AFOV, 90);
 		SkyCamera_Setup(g_vecCubePos);
-		renderscene();
+		CSQC_RenderScene();
 		return;
 	}
 
@@ -305,7 +305,7 @@ CSQC_UpdateView(float w, float h, float focus)
 
 		/* draw the viewmodel in a second pass if desired */
 		if (autocvar_r_viewmodelpass && pl.health > 0) {
-			renderscene();
+			CSQC_RenderScene();
 			clearscene();
 			setproperty(VF_MIN, video_mins);
 			setproperty(VF_SIZE, video_res);
@@ -597,7 +597,7 @@ CSQC_Parse_Event(void)
 		pSeat->m_flShakeFreq = readfloat();
 		pSeat->m_flShakeTime = pSeat->m_flShakeDuration;
 	default:
-		Game_Parse_Event(fHeader);
+		ClientGame_EventParse(fHeader);
 	}
 }
 
@@ -750,7 +750,7 @@ CSQC_ConsoleCommand(string sCMD)
 		CSQC_Parse_Print(argv(1), PRINT_CHAT);
 		break;
 	default:
-		return Game_ConsoleCommand();
+		return ClientGame_ConsoleCommand();
 	}
 	return TRUE;
 }
@@ -894,7 +894,7 @@ CSQC_Ent_Update(float new)
 		ips.ReceiveEntity(readfloat());
 		break;
 	default:
-		if (Game_Entity_Update(t, new) == FALSE) {
+		if (ClientGame_EntityUpdate(t, new) == FALSE) {
 			error("Unknown entity type update received.\n");
 		}
 	}

src/client/view.qc

@@ -154,7 +154,7 @@ View_DrawViewModel(void)
 	m_eViewModel.frame2time = pl.weapontime;
     	m_eViewModel.frame1time = pl.weapontime;
 	processmodelevents(m_eViewModel.modelindex, m_eViewModel.frame, fBaseTime,
-		m_eViewModel.frame1time, Game_ClientModelEvent);
+		m_eViewModel.frame1time, ClientGame_ModelEvent);
 
 	makevectors(view_angles);
 	m_eViewModel.angles = view_angles;

src/gs-entbase/server/trigger_teleport.qc

@@ -48,7 +48,7 @@ trigger_teleport::touch(void)
 	if (!(spawnflags & TRIGTELE_MONSTERS) && other.flags & FL_MONSTER)
 		return;
 
-	if (other.health > 0 || other.solid == SOLID_SLIDEBOX) {
+	if (other.movetype != MOVETYPE_NONE) {
 		eActivator = other;
 		entity eTarget = find(world, ::targetname, target);
 

src/gs-entbase/shared/baseentity.qc

@@ -170,7 +170,7 @@ CBaseEntity::predraw(void)
 	ProcessWordQue();
 
 	processmodelevents(modelindex, frame, m_flBaseTime,
-		frame1time, Game_ClientModelEvent);
+		frame1time, ClientGame_ModelEvent);
 
 	if (alpha > 0.0)
 		addentity(this);

tfc/src/client/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../tfc/data.pk3dir
 	$(CC) progs.src

tfc/src/client/entities.qc

@@ -15,7 +15,7 @@
  */
 
 int
-Game_Entity_Update(float id, float new)
+ClientGame_EntityUpdate(float id, float new)
 {
 	switch (id) {
 	default:

tfc/src/client/init.qc

@@ -16,25 +16,25 @@
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 	Obituary_Init();
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 //	VGUI_ChooseTeam();
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 	Obituary_Precache();
 

tfc/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../..//data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../..//csprogs.dat"
 
 #define CSQC
 #define CLIENT

tfc/src/server/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../../tfc/data.pk3dir
 	$(CC) progs.src

tfc/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER

valve.fmf

@@ -25,6 +25,7 @@ BASEGAME valve
 -set gameinfo_menutrack ""
 -set gameinfo_chatroom "halflife"
 -set gameinfo_pkgname "valve_uplink valve_realmedia valve_patch1110 valve_opfordemo valve_hlds logos_realmedia valve_dayone addon_furtherdata addon_holidaymodels"
+-set gameinfo_pkgfile "halflife.wad"
 
 DOWNLOADSURL http://www.frag-net.com/dl/valve_packages
 UPDATEURL http://www.frag-net.com/mods/valve.fmf

valve/src/client/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../data.pk3dir
 	$(CC) progs.src

valve/src/client/cmds.qc

@@ -15,7 +15,7 @@
  */
 
 int
-Game_ConsoleCommand(void)
+ClientGame_ConsoleCommand(void)
 {
 	switch(argv(0)) {
 		default:

valve/src/client/entities.qc

@@ -15,7 +15,7 @@
  */
 
 int
-Game_Entity_Update(float id, float new)
+ClientGame_EntityUpdate(float id, float new)
 {
 	switch (id) {
 	case ENT_TRIPMINE:

valve/src/client/game_event.qc

@@ -15,7 +15,7 @@
  */
 
 void
-Game_Parse_Event(float fHeader)
+ClientGame_EventParse(float fHeader)
 {
 	switch (fHeader) {
 	case EV_OBITUARY:

valve/src/client/init.qc

@@ -16,24 +16,24 @@
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 	Obituary_Init();
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 	Obituary_Precache();
 

valve/src/client/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma progs_dat  "../../csprogs.dat"
 
 #define CSQC
 #define CLIENT

valve/src/server/Makefile

@@ -1,5 +1,4 @@
 CC=fteqcc
 
 all:
-	mkdir -p ../../data.pk3dir
 	$(CC) progs.src

valve/src/server/player.qc

@@ -134,7 +134,7 @@ float Player_SendEntity(entity ePEnt, float fChanged)
 		WriteFloat(MSG_ENTITY, (__variant)pl.g_items);
 	}
 	if (fChanged & PLAYER_HEALTH) {
-		WriteByte(MSG_ENTITY, pl.health);
+		WriteByte(MSG_ENTITY, bound(0, pl.health, 255));
 	}
 	if (fChanged & PLAYER_ARMOR) {
 		WriteByte(MSG_ENTITY, pl.armor);

valve/src/server/progs.src

@@ -1,5 +1,5 @@
 #pragma target fte
-#pragma progs_dat  "../../data.pk3dir/progs.dat"
+#pragma progs_dat  "../../progs.dat"
 
 #define QWSSQC
 #define SERVER