From d2bdc681158c2d1fa3c877b93ea775d987bfe337 Mon Sep 17 00:00:00 2001 From: savagex Date: Sun, 4 Dec 2005 18:55:46 +0000 Subject: [PATCH] merge observer-message with welcomemessage git-svn-id: svn://svn.icculus.org/nexuiz/trunk@626 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/gamec/cl_client.c | 13 ++++++++----- data/qcsrc/gamec/teamplay.c | 22 ++++++++++++++++------ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/data/qcsrc/gamec/cl_client.c b/data/qcsrc/gamec/cl_client.c index 4e95b6971..d306d7f91 100644 --- a/data/qcsrc/gamec/cl_client.c +++ b/data/qcsrc/gamec/cl_client.c @@ -1095,7 +1095,8 @@ void PlayerPreThink (void) //if (TetrisPreFrame()) return; } else if(self.classname == "observer") { - if (self.flags & FL_JUMPRELEASED) { + PrintWelcomeMessage(self); + if (self.flags & FL_JUMPRELEASED) { if (self.button2) { self.flags = self.flags & !FL_JUMPRELEASED; self.classname = "player"; @@ -1119,9 +1120,10 @@ void PlayerPreThink (void) centerprint(self, "\n\n\n^1You have no more lives left\nwait for next round\n\n\n^7press attack to spectate other players"); else if(cvar("g_lms") && self.frags == -1) centerprint(self, "\n\n\n^1Match has already begun\nwait for next round\n\n\n^7press attack to spectate other players"); - else - centerprint(self, "\n\n\npress jump to play\npress attack to spectate other players"); + //else + //centerprint(self, "\n\n\npress jump to play\npress attack to spectate other players"); } else if(self.classname == "spectator") { + PrintWelcomeMessage(self); if (self.flags & FL_JUMPRELEASED) { if(self.button0) { self.flags = self.flags & !FL_JUMPRELEASED; @@ -1149,7 +1151,8 @@ void PlayerPreThink (void) self.flags = self.flags | FL_JUMPRELEASED; } } - centerprint(self, strcat("spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode")); + //centerprint(self, strcat("spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode")); + } } @@ -1173,7 +1176,7 @@ void PlayerPostThink (void) if (intermission_running) return; // intermission or finale - PrintWelcomeMessage(self); + //PrintWelcomeMessage(self); //if (TetrisPostFrame()) return; } else if (self.classname == "observer") { //do nothing diff --git a/data/qcsrc/gamec/teamplay.c b/data/qcsrc/gamec/teamplay.c index e9ae346d8..415bdb99f 100644 --- a/data/qcsrc/gamec/teamplay.c +++ b/data/qcsrc/gamec/teamplay.c @@ -238,25 +238,35 @@ void PrintWelcomeMessage(entity pl) string s, grap_msg, temp, temp2; float colored; - if(self.welcomemessage_time < time) + /*if(self.welcomemessage_time < time) return; if(self.welcomemessage_time2 > time) return; - self.welcomemessage_time2 = time + 0.8; - + self.welcomemessage_time2 = time + 0.8; */ + colored = 1; if(colored) { + + if(cvar("g_minstagib")) - temp2 = strcat("^2Minstagib ^1", gamemode_name); + temp2 = strcat(temp2, "^2Minstagib ^1", gamemode_name); else - temp2 = gamemode_name; + temp2 = strcat(temp2, gamemode_name); if(cvar("g_grappling_hook")) grap_msg = strzone("\n\nBind a key to ^1+hook^8 to use the grappling hook\n"); - s = strcat("\n\nThis is Nexuiz ", cvar_string("g_nexuizversion"), "\n", self.versionmessage, "^8\n\nMatch type is ^1", temp2, "^8\n"); + s = strcat(s, "\n\nThis is Nexuiz ", cvar_string("g_nexuizversion"), "\n", self.versionmessage, "^8\n\nMatch type is ^1", temp2, "^8\n"); + + if(self.classname == "observer" || self.classname == "spectator") { + s = strcat(s,"^7\n\n\npress jump to play\npress attack to spectate other players\n\n"); + } + + if(self.classname == "spectator") + s = strcat(s, "spectating ", self.enemy.netname, "\n\n^7press attack for next player\npress attack2 for free fly mode\n"); + s = strzone(s); temp = strcat( -- 2.39.2