From 05271aece70402b1a7d0ae83fe1b264a6b5044d0 Mon Sep 17 00:00:00 2001 From: driAn Date: Sun, 3 Feb 2008 09:11:51 +0000 Subject: [PATCH] hud fixes, vote restrictions git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1589 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- packages/textures/kurt/klite2.jpg | Bin 200 -> 132 bytes source/src/clients2c.cpp | 2 +- source/src/renderhud.cpp | 2 +- source/src/server.cpp | 5 ++--- source/src/serveractions.h | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/textures/kurt/klite2.jpg b/packages/textures/kurt/klite2.jpg index 303688b0ca84743a9c978564540b0a33053a3f1c..ec51a3def7b75c71a17ddd7ba8bee2434a4f1d71 100755 GIT binary patch delta 61 rcmX@X*uuyo-_5}Q2HcO6Ch`Pm^nFkgiu1!oGBIRWc6o(xF)#oCBE}LO delta 129 zcmZo+Ji*8#-_5}Q0!+-p2@`n&at<9@sIcE=Yeq}k;iTT@iW>?vPOd-UBe(Ej!N21h zqarMpJX9l3-+r M(0;O_MSy_;0OavF)&Kwi diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index a558766c..d1fa88ba 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -642,7 +642,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) player1->spectating = SM_FLY; } //else stopdemo(); - else callvote(SA_STOPDEMO); // FIXME + //else callvote(SA_STOPDEMO); // FIXME demoplayback = on!=0; break; } diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index f491634a..23873894 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -448,7 +448,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat glOrtho(0, VIRTW*3/2, VIRTH*3/2, 0, -1, 1); const int left = (VIRTW*3/2)*6/8, top = (VIRTH*3/2)*3/4; draw_textf("F7 spectate", left, top); - draw_textf("F8 followplayer", left, top+80); + draw_textf("F8 follow player", left, top+80); } if(player1->state==CS_SPECTATE || (player1->state==CS_DEAD && player1->spectating!=SM_NONE)) diff --git a/source/src/server.cpp b/source/src/server.cpp index 4407bf31..117b64d9 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -566,7 +566,7 @@ void enddemorecord() demorecord = NULL; #ifdef WIN32 - demotmp = fopen("demorecord", "rb"); + demotmp = fopen(path("demos/demorecord", true), "rb"); #endif if(!demotmp) return; @@ -1433,7 +1433,7 @@ void checkvotes(bool forceend) loopv(clients) if(clients[i]->type!=ST_EMPTY && clients[i]->connectmillis < curvote->callmillis) { stats[clients[i]->vote]++; }; int total = stats[VOTE_NO]+stats[VOTE_YES]+stats[VOTE_NEUTRAL]; const float requiredcount = 0.51f; - if(stats[VOTE_YES]/(float)total > requiredcount || (curvote->isvalid() && clients[curvote->owner]->role > curvote->action->role)) + if(stats[VOTE_YES]/(float)total > requiredcount || (curvote->isvalid() && clients[curvote->owner]->role >= curvote->action->role)) { sendf(-1, 1, "ri2", SV_VOTERESULT, VOTE_YES); curvote->pass(); @@ -2427,4 +2427,3 @@ int main(int argc, char **argv) return EXIT_SUCCESS; } #endif - diff --git a/source/src/serveractions.h b/source/src/serveractions.h index 08cd5c76..dc6e3ef4 100644 --- a/source/src/serveractions.h +++ b/source/src/serveractions.h @@ -122,7 +122,7 @@ struct recorddemoaction : enableaction void perform() { demonextmatch = enable; } recorddemoaction(bool enable) : enableaction(enable) { - role = CR_MASTER; + role = CR_ADMIN; dedicated = true; } }; @@ -136,7 +136,7 @@ struct stopdemoaction : serveraction } stopdemoaction() { - role = CR_MASTER; + role = CR_ADMIN; dedicated = true; } }; @@ -147,7 +147,7 @@ struct cleardemosaction : serveraction void perform() { cleardemos(demo); } cleardemosaction(int demo) : demo(demo) { - role = CR_MASTER; + role = CR_ADMIN; dedicated = true; } };