Version 1.091a

This commit is contained in:
GreYFoX 2011-08-31 12:10:15 +02:00
parent bf5374adbf
commit 7e24be5d83
12 changed files with 11 additions and 14 deletions

View file

@ -1946,4 +1946,4 @@ unsigned str_quickhash(const char *str)
#if defined(__cplusplus)
}
#endif
#endif

View file

@ -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 <game/ddracecommands.h>

View file

@ -21,7 +21,9 @@ enum
CFGFLAG_SERVER=4,
CFGFLAG_STORE=8,
CFGFLAG_MASTER=16,
// DDRace
CMDFLAG_TEST=32,
CFGFLAG_CHAT = 64
};

View file

@ -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;
}
}
}

View file

@ -339,4 +339,4 @@ void CBinds::SetDDRaceBinds(bool FreeOnly)
Bind(KEY_EQUALS, "spectate_next");
}
g_Config.m_ClDDRaceBindsSet = 1;
}
}

View file

@ -33,4 +33,4 @@ private:
static void ConZoomReset(IConsole::IResult *pResult, void *pUserData);
};
#endif
#endif

View file

@ -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);
}
}
}

View file

@ -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);

View file

@ -40,7 +40,6 @@ void CLayers::Init(class IKernel *pKernel)
{
CMapItemLayerTilemap *pTilemap = reinterpret_cast<CMapItemLayerTilemap *>(pLayer);
if(pTilemap->m_Flags&TILESLAYERFLAG_GAME)
{
m_pGameLayer = pTilemap;

View file

@ -42,4 +42,4 @@ private:
CMapItemLayerTilemap *m_pSwitchLayer;
};
#endif
#endif

View file

@ -174,4 +174,4 @@ void CPickup::Move()
}
m_Pos += m_Core;
}
}
}

View file

@ -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