# HG changeset patch # User unc0rr # Date 1354992183 -14400 # Node ID d4e113e745a9dfad102496f8e75eb728f3023c12 # Parent e0a134d890e7279c00eb977003135872c5cf3df3 Some fixes diff -r e0a134d890e7 -r d4e113e745a9 QTfrontend/game.cpp --- a/QTfrontend/game.cpp Sat Dec 08 20:23:13 2012 +0400 +++ b/QTfrontend/game.cpp Sat Dec 08 22:43:03 2012 +0400 @@ -431,17 +431,17 @@ } -static void HWGame::onChat(void* context, const char *msg, bool teamchat) +void HWGame::onChat(void* context, const char *msg, bool teamchat) { HWGame * game = (HWGame *) context; } -static void HWGame::onConnect(void* context) +void HWGame::onConnect(void* context) { HWGame * game = (HWGame *) context; } -static void HWGame::onDisconnect(void* context, int reason) +void HWGame::onDisconnect(void* context, int reason) { HWGame * game = (HWGame *) context; /* @@ -465,17 +465,17 @@ game->SetGameState(gsStopped); } -static void HWGame::onEngineMessage(void *context, const uint8_t *em, size_t size) +void HWGame::onEngineMessage(void *context, const uint8_t *em, size_t size) { HWGame * game = (HWGame *) context; } -static void HWGame::onErrorMessage(void* context, const char *msg) +void HWGame::onErrorMessage(void* context, const char *msg) { HWGame * game = (HWGame *) context; } -static void HWGame::onGameRecorded(void *context, const uint8_t *record, size_t size, bool isSavegame) +void HWGame::onGameRecorded(void *context, const uint8_t *record, size_t size, bool isSavegame) { HWGame * game = (HWGame *) context; } diff -r e0a134d890e7 -r d4e113e745a9 QTfrontend/hwconsts.h --- a/QTfrontend/hwconsts.h Sat Dec 08 20:23:13 2012 +0400 +++ b/QTfrontend/hwconsts.h Sat Dec 08 22:43:03 2012 +0400 @@ -63,10 +63,10 @@ #define HEDGEHOGS_PER_TEAM 8 -#define AMMOLINE_DEFAULT_QT "9391929422199121032235111001201000000211110101011111101" -#define AMMOLINE_DEFAULT_PROB "0405040541600655546554464776576666666155510101115411101" -#define AMMOLINE_DEFAULT_DELAY "0000000000000205500000040007004000000000220000000600000" -#define AMMOLINE_DEFAULT_CRATE "1311110312111111123114111111111111111211111101111111101" +//#define AMMOLINE_DEFAULT_QT "9391929422199121032235111001201000000211110101011111101" +//#define AMMOLINE_DEFAULT_PROB "0405040541600655546554464776576666666155510101115411101" +//#define AMMOLINE_DEFAULT_DELAY "0000000000000205500000040007004000000000220000000600000" +//#define AMMOLINE_DEFAULT_CRATE "1311110312111111123114111111111111111211111101111111101" #define AMMOLINE_CRAZY_QT "9999999999999999992999999999999999299999999909999992909" #define AMMOLINE_CRAZY_PROB "1111110111111111111111111111111111111111111101111111101" diff -r e0a134d890e7 -r d4e113e745a9 project_files/frontlib/hwconsts.h --- a/project_files/frontlib/hwconsts.h Sat Dec 08 20:23:13 2012 +0400 +++ b/project_files/frontlib/hwconsts.h Sat Dec 08 22:43:03 2012 +0400 @@ -44,7 +44,7 @@ //! Used for sending scripts to the engine #define MULTIPLAYER_SCRIPT_PATH "Scripts/Multiplayer/" -#define WEAPONS_COUNT 56 +#define WEAPONS_COUNT 55 // TODO allow frontend to override these? /*! A merge of mikade/bugq colours w/ a bit of channel feedback */ #define HW_TEAMCOLOR_ARRAY { UINT32_C(0xffff0204), /*! red */ \ @@ -59,10 +59,10 @@ /*! add new colors here */ \ 0 } /*! Keep this 0 at the end */ -#define AMMOLINE_DEFAULT_QT "93919294221991210322351110012010000002111101010111110101" -#define AMMOLINE_DEFAULT_PROB "04050405416006555465544647765766666661555101011154110101" -#define AMMOLINE_DEFAULT_DELAY "00000000000002055000000400070040000000002200000006000000" -#define AMMOLINE_DEFAULT_CRATE "13111103121111111231141111111111111112111111011111110101" +#define AMMOLINE_DEFAULT_QT "9391929422199121032235111001201000000211110101011111101" +#define AMMOLINE_DEFAULT_PROB "0405040541600655546554464776576666666155510101115411101" +#define AMMOLINE_DEFAULT_DELAY "0000000000000205500000040007004000000000220000000600000" +#define AMMOLINE_DEFAULT_CRATE "1311110312111111123114111111111111111211111101111111101" extern const size_t flib_teamcolor_count; extern const uint32_t flib_teamcolors[];