diff --git a/config/sounds.cfg b/config/sounds.cfg index 91ddb829..c15fa9a5 100755 --- a/config/sounds.cfg +++ b/config/sounds.cfg @@ -14,7 +14,7 @@ registersound "weapon/waterimpact" // 6 - S_BULLETWATERHIT registersound "weapon/knife" // 7 - S_KNIFE registersound "weapon/usp" // 8 - S_PISTOL registersound "weapon/pistol_reload" // 9 - S_RPISTOL -registersound "weapon/rifle" // 10 - S_RIFLE +registersound "weapon/carbine_alt" // 10 - S_RIFLE registersound "weapon/rifle_reload" // 11 - S_RRIFLE // temporary registersound "weapon/shotgun" // 12 - S_SHOTGUN registersound "weapon/shotgun_reload" // 13 - S_RSHOTGUN diff --git a/packages/audio/sounds/weapon/carbine.ogg b/packages/audio/sounds/weapon/carbine.ogg index b47b11f0..e03fd27f 100644 Binary files a/packages/audio/sounds/weapon/carbine.ogg and b/packages/audio/sounds/weapon/carbine.ogg differ diff --git a/packages/audio/sounds/weapon/rifle_alt.ogg b/packages/audio/sounds/weapon/rifle_alt.ogg new file mode 100644 index 00000000..5b93c32c Binary files /dev/null and b/packages/audio/sounds/weapon/rifle_alt.ogg differ diff --git a/source/src/server.cpp b/source/src/server.cpp index eb631bb2..401c5bbf 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1624,7 +1624,7 @@ void startdemoplayback(const char *newname) setupdemoplayback(); } -int Mvolume, Marea; +int Mvolume, Marea, Mopen; float Mheight = 0; void startgame(const char *newname, int newmode, int newtime, bool notify) diff --git a/source/src/server.h b/source/src/server.h index 295eee91..b759480e 100644 --- a/source/src/server.h +++ b/source/src/server.h @@ -396,7 +396,7 @@ guninfo guns[NUMGUNS] = { "pistol", S_PISTOL, S_RPISTOL, 1400, 160, 18, 0, 0, 55, 10, 8, 6, 5, 1, 40, 75, 150, 1, false }, { "rifle", S_RIFLE, S_RRIFLE, 1950, 720, 50, 0, 0, 20, 50, 10, 4, 4, 2, 100, 60, 150, 1, false }, // temporary values { "shotgun", S_SHOTGUN, S_RSHOTGUN, 2400, 1000, 5, 0, 0, 1, 35, 7, 9, 9, 1, 130, 500, 150, 1, false }, - { "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 14, 0, 0, 70, 15, 30, 1, 2, 5, 15, 55, 250, 1, true }, + { "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 15, 0, 0, 70, 15, 30, 1, 2, 5, 15, 55, 250, 1, true }, { "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 80, 0, 0, 60, 50, 5, 4, 4, 1, 100, 500, 100, 1, false }, { "assault", S_ASSAULT, S_RASSAULT, 2000, 120, 24, 0, 0, 20, 40, 20, 0, 2, 2, 25, 60, 150, 1, true }, { "grenade", S_NULL, S_NULL, 1000, 650, 200, 20, 6, 1, 1, 1, 3, 1, 0, 0, 0, 0, 3, false }, diff --git a/source/src/serverchecks.h b/source/src/serverchecks.h index 32732db0..7af87765 100644 --- a/source/src/serverchecks.h +++ b/source/src/serverchecks.h @@ -1,14 +1,20 @@ + +int checkarea(char *maplayout) +{ + return 0; +} + /** If you read README.txt you must know that AC does not have cheat protection implemented. However this file is the sketch to a very special kind of cheat detection tools in server side. This is not based in program tricks, i.e., encryption, secret bytes, nor monitoring/scanning tools. -The idea behind these cheat detection is to check (or reproduce) the client data, and verify if +The idea behind these cheat detections is to check (or reproduce) the client data, and verify if this data is expected or possible. Also, there is no need to check all clients all time, and one coding this kind of check must pay a special attention to the lag effect and how it can affect the data observed. This is not a trivial task, and probably it is the main reason why -of such tools were never implemented. +such tools were never implemented. This file is here for compatibility purposes. If you know nothing about these detections, please, just ignore it. diff --git a/source/src/tools.cpp b/source/src/tools.cpp index a8b8322b..4ba1135f 100644 --- a/source/src/tools.cpp +++ b/source/src/tools.cpp @@ -25,8 +25,9 @@ const char *numtime() } extern char *maplayout; -extern int maplayout_factor, Mvolume, Marea; +extern int maplayout_factor, Mvolume, Marea, Mopen; extern float Mheight; +extern int checkarea(char *maplayout); mapstats *loadmapstats(const char *filename, bool getlayout) { @@ -83,7 +84,7 @@ mapstats *loadmapstats(const char *filename, bool getlayout) char *t = NULL; char floor = 0, ceil; int diff; - Mvolume = Marea = 0; + Mvolume = Marea = Mopen = 0; loopk(layoutsize) { char *c = maplayout + k; @@ -128,7 +129,10 @@ mapstats *loadmapstats(const char *filename, bool getlayout) t = c; } if(fail) { DELETEA(maplayout); } - else Mheight = Marea ? (float)Mvolume/Marea : 0; + else { + Mheight = Marea ? (float)Mvolume/Marea : 0; + Mopen = checkarea(maplayout); + } } } delete f; diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 4a0abd29..b22a4b27 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -618,8 +618,8 @@ void weapon::renderstats() } } -//VAR(recoiltest, 0, 0, 1); // DISABLE ON RELEASE -int recoiltest = 0; +VAR(recoiltest, 0, 0, 1); // DISABLE ON RELEASE +//int recoiltest = 0; VAR(recoilincrease, 1, 2, 10); VAR(recoilbase, 0, 40, 1000); diff --git a/source/src/world.h b/source/src/world.h index f7f01b55..947af7a2 100644 --- a/source/src/world.h +++ b/source/src/world.h @@ -125,6 +125,7 @@ struct mapstats #define MINBORD 2 // 2 cubes from the edge of the world are always solid #define OUTBORD(x,y) ((x)=ssize-MINBORD || (y)>=ssize-MINBORD) #define OUTBORDRAD(x,y,rad) (int(x-rad)=ssize-MINBORD || (y+rad)>=ssize-MINBORD) +#define MAXMHEIGHT 30 struct block { int x, y, xs, ys; };