From 7e24be5d83fbffb090ec2bb470aed26f41c00661 Mon Sep 17 00:00:00 2001 From: GreYFoX Date: Wed, 31 Aug 2011 12:10:15 +0200 Subject: [PATCH] Version 1.091a --- src/base/system.c | 2 +- src/engine/client/client.cpp | 4 ---- src/engine/shared/config.h | 2 ++ src/engine/shared/console.cpp | 1 - src/game/client/components/binds.cpp | 2 +- src/game/client/components/camera.h | 2 +- src/game/client/components/menus.cpp | 2 +- src/game/gamecore.cpp | 1 + src/game/layers.cpp | 1 - src/game/layers.h | 2 +- src/game/server/entities/pickup.cpp | 2 +- src/game/version.h | 4 ++-- 12 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/base/system.c b/src/base/system.c index 881bea132..de1f4eef8 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -1946,4 +1946,4 @@ unsigned str_quickhash(const char *str) #if defined(__cplusplus) } -#endif +#endif \ No newline at end of file diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 309ccee8e..fb715078e 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -2170,10 +2170,6 @@ void CClient::RegisterCommands() // DDRace - m_pConsole->Register("login", "?s", CFGFLAG_SERVER, 0, 0, "Allows you access to rcon if no password is given, or changes your level if a password is given"); - m_pConsole->Register("auth", "?s", CFGFLAG_SERVER, 0, 0, "Allows you access to rcon if no password is given, or changes your level if a password is given"); - m_pConsole->Register("vote", "r", CFGFLAG_SERVER, 0, 0, "Forces the current vote to result in r (Yes/No)"); - m_pConsole->Register("cmdlist", "", CFGFLAG_SERVER, 0, 0, "Shows the list of all commands"); #define CONSOLE_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, 0, 0, help); #include diff --git a/src/engine/shared/config.h b/src/engine/shared/config.h index 6ccf1e4ee..f5fc8242d 100644 --- a/src/engine/shared/config.h +++ b/src/engine/shared/config.h @@ -21,7 +21,9 @@ enum CFGFLAG_SERVER=4, CFGFLAG_STORE=8, CFGFLAG_MASTER=16, + // DDRace + CMDFLAG_TEST=32, CFGFLAG_CHAT = 64 }; diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp index bf7ccda1f..e7c06d453 100644 --- a/src/engine/shared/console.cpp +++ b/src/engine/shared/console.cpp @@ -328,7 +328,6 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID) pCommand->m_pfnCallback(&Result, pCommand->m_pUserData); if (pCommand->m_Flags&CMDFLAG_TEST) m_Cheated = true; - } } } diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp index 9130a19a4..ab151a61a 100644 --- a/src/game/client/components/binds.cpp +++ b/src/game/client/components/binds.cpp @@ -339,4 +339,4 @@ void CBinds::SetDDRaceBinds(bool FreeOnly) Bind(KEY_EQUALS, "spectate_next"); } g_Config.m_ClDDRaceBindsSet = 1; -} +} \ No newline at end of file diff --git a/src/game/client/components/camera.h b/src/game/client/components/camera.h index bc2e95beb..94dce2cc7 100644 --- a/src/game/client/components/camera.h +++ b/src/game/client/components/camera.h @@ -33,4 +33,4 @@ private: static void ConZoomReset(IConsole::IResult *pResult, void *pUserData); }; -#endif +#endif \ No newline at end of file diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 65339d81f..91edf514a 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -1633,4 +1633,4 @@ int CMenus::DoButton_CheckBox_DontCare(const void *pID, const char *pText, int C default: return DoButton_CheckBox_Common(pID, pText, "", pRect); } -} +} \ No newline at end of file diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp index a83d87408..c0edba22d 100644 --- a/src/game/gamecore.cpp +++ b/src/game/gamecore.cpp @@ -383,6 +383,7 @@ void CCharacterCore::Tick(bool UseInput) { float Accel = m_pWorld->m_Tuning.m_HookDragAccel * (Distance/m_pWorld->m_Tuning.m_HookLength); float DragSpeed = m_pWorld->m_Tuning.m_HookDragSpeed; + // add force to the hooked player vec2 Temp = pCharCore->m_Vel; Temp.x = SaturatedAdd(-DragSpeed, DragSpeed, pCharCore->m_Vel.x, Accel*Dir.x*1.5f); diff --git a/src/game/layers.cpp b/src/game/layers.cpp index f7efe36ee..28180b376 100644 --- a/src/game/layers.cpp +++ b/src/game/layers.cpp @@ -40,7 +40,6 @@ void CLayers::Init(class IKernel *pKernel) { CMapItemLayerTilemap *pTilemap = reinterpret_cast(pLayer); - if(pTilemap->m_Flags&TILESLAYERFLAG_GAME) { m_pGameLayer = pTilemap; diff --git a/src/game/layers.h b/src/game/layers.h index 477d61a09..0ba672716 100644 --- a/src/game/layers.h +++ b/src/game/layers.h @@ -42,4 +42,4 @@ private: CMapItemLayerTilemap *m_pSwitchLayer; }; -#endif +#endif \ No newline at end of file diff --git a/src/game/server/entities/pickup.cpp b/src/game/server/entities/pickup.cpp index 1067e9524..6fab002fb 100644 --- a/src/game/server/entities/pickup.cpp +++ b/src/game/server/entities/pickup.cpp @@ -174,4 +174,4 @@ void CPickup::Move() } m_Pos += m_Core; } -} +} \ No newline at end of file diff --git a/src/game/version.h b/src/game/version.h index 0ba62399d..d18d6ab58 100644 --- a/src/game/version.h +++ b/src/game/version.h @@ -3,6 +3,6 @@ #ifndef GAME_VERSION_H #define GAME_VERSION_H #include "generated/nethash.cpp" -#define GAME_VERSION "0.6 trunk, 1.09a" +#define GAME_VERSION "0.6 trunk, 1.091a" #define GAME_NETVERSION "0.6 626fce9a778df4d4" -#endif +#endif \ No newline at end of file