From 583581777761c481c70091ac9ca9877a4006de25 Mon Sep 17 00:00:00 2001 From: Rafael Barreto Date: Tue, 18 May 2010 16:36:38 +0000 Subject: [PATCH] Carbine sounds, and testing 15 dmg for smg git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4911 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/sounds.cfg | 2 +- packages/audio/sounds/weapon/carbine.ogg | Bin 11332 -> 9273 bytes packages/audio/sounds/weapon/rifle_alt.ogg | Bin 0 -> 12664 bytes source/src/server.cpp | 2 +- source/src/server.h | 2 +- source/src/serverchecks.h | 10 ++++++++-- source/src/tools.cpp | 10 +++++++--- source/src/weapon.cpp | 4 ++-- source/src/world.h | 1 + 9 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 packages/audio/sounds/weapon/rifle_alt.ogg 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 b47b11f0303e939b7ed45cdac5679c2dfa813abc..e03fd27fc53c7ea56b45aef5eec003a17d89e34c 100644 GIT binary patch delta 8221 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 P-gl@NrBe5V=T-j?dwpTt delta 10377 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 diff --git a/packages/audio/sounds/weapon/rifle_alt.ogg b/packages/audio/sounds/weapon/rifle_alt.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5b93c32c538f401691cf57b52b7d58c649ed438e GIT binary patch literal 12664 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 literal 0 HcmV?d00001 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; };