Added shots / hits incrementing (fixes accuracy)

greghaynes · Jul 21, 2010 · cd689af · cd689af
1 parent cca2f7d
commit cd689af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/src/fpsgame/server.cpp b/src/fpsgame/server.cpp
@@ -1120,11 +1120,6 @@ namespace server
         gamelimit = gamemillis + (mins * 60000) + 1;
     }
 
-    void endgame()
-    {
-		setgamemins(0);
-    }
-
     void checkintermission()
     {
         if(gamemillis >= gamelimit && !interm)
@@ -1216,6 +1211,7 @@ namespace server
                 return;
         }
         sendf(-1, 1, "ri4x", N_EXPLODEFX, ci->clientnum, gun, id, ci->ownernum);
+        gs.shots++;
         loopv(hits)
         {
             hitinfo &h = hits[i];
@@ -1226,6 +1222,7 @@ namespace server
             loopj(i) if(hits[j].target==h.target) { dup = true; break; }
             if(dup) continue;
 
+            gs.hits++;
             int damage = guns[gun].damage;
             if(gs.quadmillis) damage *= 4;
             damage = int(damage*(1-h.dist/RL_DISTSCALE/RL_DAMRAD));
@@ -1251,6 +1248,7 @@ namespace server
                 int(to.x*DMF), int(to.y*DMF), int(to.z*DMF),
                 ci->ownernum);
         gs.shotdamage += guns[gun].damage*(gs.quadmillis ? 4 : 1)*(gun==GUN_SG ? SGRAYS : 1);
+        gs.shots++;
         switch(gun)
         {
             case GUN_RL: gs.rockets.add(id); break;
@@ -1264,6 +1262,7 @@ namespace server
                     clientinfo *target = getinfo(h.target);
                     if(!target || target->state.state!=CS_ALIVE || h.lifesequence!=target->state.lifesequence || h.rays<1 || h.dist > guns[gun].range + 1) continue;
 
+                    gs.hits++;
                     totalrays += h.rays;
                     if(totalrays>maxrays) continue;
                     int damage = h.rays*guns[gun].damage;

diff --git a/src/fpsgame/server.h b/src/fpsgame/server.h
@@ -439,7 +439,6 @@ namespace server
 	bool pregame_setteam(clientinfo *, char *);
 	bool spectate(clientinfo *, bool, int);
 	void setgamemins(int mins);
-	void endgame();
 	void resetpriv(clientinfo *ci);
 	void sendmapreload();
 	void senddemo(int cn, int num);

diff --git a/src/pycontrol/servermodule.cpp b/src/pycontrol/servermodule.cpp
@@ -752,13 +752,6 @@ static PyObject *setGameMins(PyObject *self, PyObject *args)
 	return Py_None;
 }
 
-static PyObject *endGame(PyObject *self, PyObject *args)
-{
-	server::endgame();
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
 static PyObject *adminPass(PyObject *self, PyObject *args)
 {
 	return Py_BuildValue("s", server::adminpass);
@@ -959,7 +952,6 @@ static PyMethodDef ModuleMethods[] = {
 	{"port", port, METH_VARARGS, "Current server port."},
 	{"authChallenge", authChal, METH_VARARGS, "Send auth challenge to client."},
 	{"setMinsRemaining", setGameMins, METH_VARARGS, "Set the minutes remanining in current game."},
-	{"endGame", endGame, METH_VARARGS, "End the current game."},
 	{"adminPassword", adminPass, METH_VARARGS, "Get the administrator password."},
 	{"publicServer", publicServer, METH_VARARGS, "Decides how masters are chosen and what privileges they have."},
 	{"sendMapReload", sendMapReload, METH_VARARGS, "Causes all users to send vote on next map."},
@@ -971,9 +963,10 @@ static PyMethodDef ModuleMethods[] = {
 	{"nextMatchRecorded", nextMatchRecorded, METH_VARARGS, "Is next match being recorded."},
 	{"setRecordNextMatch", setRecordNextMatch, METH_VARARGS, "Set to record demo of next match."},
 	{"demoSize", demoSize, METH_VARARGS, "Size of demo in bytes."},
-    {"demoData", demoData, METH_VARARGS, "Demo data."},
+	{"demoData", demoData, METH_VARARGS, "Demo data."},
 	{"sendDemo", sendDemo, METH_VARARGS, "Send demo to client."},
 	{"suicide", suicide, METH_VARARGS, "Force client to commit suicide."},
+	{"configdir", configdir, METH_VARARGS, "Python config dir."},
 	{NULL, NULL, 0, NULL}
 };