Merge branch 'master' of https://github.com/phoenixprojectsoftware/Au…

…ra-SE
phoenixprojectsoftware · Sep 25, 2023 · c62bef9 · c62bef9
2 parents 96b384b + 7832942
commit c62bef9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/binary/dlls/agdom.cpp b/binary/dlls/agdom.cpp
@@ -266,9 +266,9 @@ void AgDOMControlPoint::Capture(CBasePlayer* pPlayer, const char* szTeamName)
     // Inform all players that zone has been taken control of by playername	
     // really need identifiers for each control point! 
     char szText[300];
-    sprintf(szText, "%s captures CP at %s!", STRING(pPlayer->pev->netname), m_szLocation);
+    sprintf(szText, "%s captured %s!", STRING(pPlayer->pev->netname), m_szLocation);
     AgConsole(szText);
-    UTIL_ClientPrintAll(HUD_PRINTCENTER, szText);
+    UTIL_ClientPrintAll(HUD_PRINTTALK, szText);
 }
 
 void AgDOMControlPoint::ChangeControllingTeam(const char* szTeamName)
@@ -381,9 +381,9 @@ void AgDOMControlPoint::Think(void)
     // a neutral state. 
     if (m_iConsecutiveScores >= ag_dom_resetscorelimit.value) {
         char szText[201];
-        sprintf(szText, "Neutral CP available at %s", m_szLocation);
+        sprintf(szText, "Control point available at %s", m_szLocation);
         AgConsole(szText);
-        UTIL_ClientPrintAll(HUD_PRINTCENTER, szText);
+        UTIL_ClientPrintAll(HUD_PRINTTALK, szText);
         Reset();
     }
 

diff --git a/binary/dlls/aghideandseek.h b/binary/dlls/aghideandseek.h
@@ -4,11 +4,15 @@
 
 //#if !defined(AFX_AGARENA_H__1929C55A_3034_4C89_8398_1F8243B83499__INCLUDED_)
 #define AFX_AGARENA_H__1929C55A_3034_4C89_8398_1F8243B83499__INCLUDED_
+#ifndef HIDEANDSEEK_H
+#define HIDEANDSEEK_H
 
 #if _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
 
+
+
 class AgHideandseek
 {
     typedef list<int> AgWaitList;
@@ -66,6 +70,8 @@ inline CBasePlayer* AgHideandseek::GetSeeker()
         return NULL;
 };
 
+
+
 inline bool AgHideandseek::CanTakeDamage()
 {
     return Playing == m_Status || PlayerDied == m_Status;
@@ -78,3 +84,4 @@ inline bool AgHideandseek::CanHaveItem()
 
 
 //#endif // !defined(AFX_AGARENA_H__1929C55A_3034_4C89_8398_1F8243B83499__INCLUDED_)
+#endif // HIDEANDSEEK_H
diff --git a/binary/dlls/agvote.cpp b/binary/dlls/agvote.cpp
@@ -81,15 +81,15 @@ bool AgVote::HandleCommand(CBasePlayer* pPlayer)
         return true;
     }
 
-    if (FStrEq(CMD_ARGV(0), "aglistvotes"))
+    /*if (FStrEq(CMD_ARGV(0), "aglistvotes"))
     {
         for (int i = 0; i < sizeof(s_szVotes) / sizeof(s_szVotes[0]); i++)
             AgConsole(s_szVotes[i], pPlayer);
 
         GameMode.Help(pPlayer);
 
         return true;
-    }
+    }*/
     else if (FStrEq(m_sVote.c_str(), "agmaxtime"))
     {
         if (!ag_vote_setting.value)

diff --git a/binary/dlls/op4_weapons/CGrapple.cpp b/binary/dlls/op4_weapons/CGrapple.cpp
@@ -560,7 +560,7 @@ int CGrapple::GetItemInfo(ItemInfo* p)
 	p->iPosition = 3;
 	p->iId = m_iId = WEAPON_GRAPPLE;
 	p->iFlags = 0;
-	p->iWeight = 21;
+	p->iWeight = GRAPPLE_WEIGHT;
 
 	return true;
 }
diff --git a/binary/dlls/weapons.h b/binary/dlls/weapons.h
@@ -106,7 +106,7 @@ class CGrenade : public CBaseMonster
 #define CROWBAR_WEIGHT		0
 #define GLOCK_WEIGHT		10
 #define PYTHON_WEIGHT		15
-#define MP5_WEIGHT			15
+#define MP5_WEIGHT			25
 #define SHOTGUN_WEIGHT		15
 #define CROSSBOW_WEIGHT		10
 #define RPG_WEIGHT			20
@@ -117,6 +117,7 @@ class CGrenade : public CBaseMonster
 #define SNARK_WEIGHT		5
 #define SATCHEL_WEIGHT		-10
 #define TRIPMINE_WEIGHT		-10
+#define GRAPPLE_WEIGHT		-10
 #define EAGLE_WEIGHT				15
 #define SPORELAUNCHER_WEIGHT 20
 #define SHOCKRIFLE_WEIGHT 15

diff --git a/binary/linux/Makefile.agdll b/binary/linux/Makefile.agdll
@@ -151,11 +151,11 @@ HLDLL_OBJS = \
 	$(HLDLL_OBJ_DIR)/agadmin.o \
 	$(HLDLL_OBJ_DIR)/agadmincache.o \
 	$(HLDLL_OBJ_DIR)/agarena.o \
-	$(HLDLL_OBJ_DIR)/aghideandseek.o \
 	$(HLDLL_OBJ_DIR)/agclient.o \
 	$(HLDLL_OBJ_DIR)/agcommand.o \
 	$(HLDLL_OBJ_DIR)/aggamerules.o \
 	$(HLDLL_OBJ_DIR)/agglobal.o \
+	$(HLDLL_OBJ_DIR)/aghideandseek.o \
 	$(HLDLL_OBJ_DIR)/agmatch.o \
 	$(HLDLL_OBJ_DIR)/agscore.o \
 	$(HLDLL_OBJ_DIR)/agscorecache.o \

diff --git a/maps/Crossfire.rmf b/maps/Crossfire.rmf