From 0e70fd1136156c35fc5ee1e914110c75178f781d Mon Sep 17 00:00:00 2001 From: puzl Date: Fri, 7 Apr 2006 07:38:58 +0000 Subject: [PATCH] o changed revision to 3.1.3 o added -test1 to game revision o changed a function to virtual to try to prevent a crash git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@380 67975925-1194-0748-b3d5-c16f83f1a3a1 --- releases/3.1.3/Balance.txt | 2 +- releases/3.1.3/source/mod/AvHBasePlayerWeapon.h | 2 +- releases/3.1.3/source/mod/AvHServerUtil.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/releases/3.1.3/Balance.txt b/releases/3.1.3/Balance.txt index 6d476363..3340237a 100644 --- a/releases/3.1.3/Balance.txt +++ b/releases/3.1.3/Balance.txt @@ -120,7 +120,7 @@ #define kGameHDSpaceNeeded 300 #define kGameVersionMajor 3 #define kGameVersionMinor 1 -#define kGameVersionRevision 2 +#define kGameVersionRevision 3 #define kGestateBaseArmor 150 #define kGestateHealth 200 #define kGorgeArmorUpgrade 50 diff --git a/releases/3.1.3/source/mod/AvHBasePlayerWeapon.h b/releases/3.1.3/source/mod/AvHBasePlayerWeapon.h index 20dc602e..d158a967 100644 --- a/releases/3.1.3/source/mod/AvHBasePlayerWeapon.h +++ b/releases/3.1.3/source/mod/AvHBasePlayerWeapon.h @@ -196,7 +196,7 @@ public: virtual void UpdateInventoryEnabledState(int inNumActiveHives); // Methods for placing in the map - void EXPORT VirtualDestroyItem(void); + virtual void EXPORT VirtualDestroyItem(void); virtual int GetLifetime() const; virtual bool GetIsPersistent() const; virtual void SetPersistent(); diff --git a/releases/3.1.3/source/mod/AvHServerUtil.cpp b/releases/3.1.3/source/mod/AvHServerUtil.cpp index 190138d3..4de9f7e1 100644 --- a/releases/3.1.3/source/mod/AvHServerUtil.cpp +++ b/releases/3.1.3/source/mod/AvHServerUtil.cpp @@ -190,7 +190,7 @@ char* AvHSUGetGameVersionString() string theGameVersionString; theGameVersionString = "v" + MakeStringFromInt(BALANCE_VAR(kGameVersionMajor)) + "." + MakeStringFromInt(BALANCE_VAR(kGameVersionMinor)) + "." + - MakeStringFromInt(BALANCE_VAR(kGameVersionRevision)); + MakeStringFromInt(BALANCE_VAR(kGameVersionRevision)) + "-test1"; //memset(theGameVersion, 0, 1024); strcpy(theGameVersion, theGameVersionString.c_str());