edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

General whitespace and tab cleanup

Browse source
This commit is contained in:
Shereef Marzouk 2011-08-11 10:59:14 +02:00
parent 2084febca7
commit c6fd4a2cc5
28 changed files with 164 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/base/system.c
View file

@ -1119,7 +1119,7 @@ int net_tcp_accept(NETSOCKET sock, NETSOCKET *new_sock, NETADDR *a)
sockaddr_len = sizeof(addr);
s = accept(sock.ipv4sock, (struct sockaddr *)&addr, &sockaddr_len);
if (s != -1)
{
sockaddr_to_netaddr((const struct sockaddr *)&addr, a);
@ -1135,7 +1135,7 @@ int net_tcp_accept(NETSOCKET sock, NETSOCKET *new_sock, NETADDR *a)
sockaddr_len = sizeof(addr);
s = accept(sock.ipv6sock, (struct sockaddr *)&addr, &sockaddr_len);
if (s != -1)
{
sockaddr_to_netaddr((const struct sockaddr *)&addr, a);
@ -1186,7 +1186,7 @@ int net_tcp_send(NETSOCKET sock, const void *data, int size)
bytes = send((int)sock.ipv4sock, (const char*)data, size, 0);
if(sock.ipv6sock >= 0)
bytes = send((int)sock.ipv6sock, (const char*)data, size, 0);
return bytes;
}
@ -1198,7 +1198,7 @@ int net_tcp_recv(NETSOCKET sock, void *data, int maxsize)
bytes = recv((int)sock.ipv4sock, (char*)data, maxsize, 0);
if(sock.ipv6sock >= 0)
bytes = recv((int)sock.ipv6sock, (char*)data, maxsize, 0);
return bytes;
}

60
src/engine/client/sound.cpp
View file

@ -19,7 +19,7 @@ enum
NUM_SAMPLES = 512,
NUM_VOICES = 64,
NUM_CHANNELS = 16,
MAX_FRAMES = 1024
};
@ -89,9 +89,9 @@ static void Mix(short *pFinalOut, unsigned Frames)
// aquire lock while we are mixing
lock_wait(m_SoundLock);
MasterVol = m_SoundVolume;
for(unsigned i = 0; i < NUM_VOICES; i++)
{
if(m_aVoices[i].m_pSample)
@ -103,7 +103,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
int Step = v->m_pSample->m_Channels; // setup input sources
short *pInL = &v->m_pSample->m_pData[v->m_Tick*Step];
short *pInR = &v->m_pSample->m_pData[v->m_Tick*Step+1];
unsigned End = v->m_pSample->m_NumFrames-v->m_Tick;
int Rvol = v->m_pChannel->m_Vol;
@ -112,7 +112,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
// make sure that we don't go outside the sound data
if(Frames < End)
End = Frames;
// check if we have a mono sound
if(v->m_pSample->m_Channels == 1)
pInR = pInL;
@ -133,7 +133,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
Lvol = ((Range-p)*Lvol)/Range;
else
Rvol = ((Range-p)*Rvol)/Range;
// falloff
Lvol = (Lvol*(Range-Dist))/Range;
Rvol = (Rvol*(Range-Dist))/Range;
@ -154,7 +154,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
pInR += Step;
v->m_Tick++;
}
// free voice if not used any more
if(v->m_Tick == v->m_pSample->m_NumFrames)
{
@ -165,8 +165,8 @@ static void Mix(short *pFinalOut, unsigned Frames)
}
}
}
// release the lock
lock_release(m_SoundLock);
@ -201,14 +201,14 @@ int CSound::Init()
m_SoundEnabled = 0;
m_pGraphics = Kernel()->RequestInterface<IEngineGraphics>();
m_pStorage = Kernel()->RequestInterface<IStorage>();
SDL_AudioSpec Format;
m_SoundLock = lock_create();
if(!g_Config.m_SndEnable)
return 0;
m_MixingRate = g_Config.m_SndRate;
// Set 16-bit stereo audio at 22Khz
@ -229,7 +229,7 @@ int CSound::Init()
dbg_msg("client/sound", "sound init successful");
SDL_PauseAudio(0);
m_SoundEnabled = 1;
Update(); // update the volume
return 0;
@ -239,17 +239,17 @@ int CSound::Update()
{
// update volume
int WantedVolume = g_Config.m_SndVolume;
if(!m_pGraphics->WindowActive() && g_Config.m_SndNonactiveMute)
WantedVolume = 0;
if(WantedVolume != m_SoundVolume)
{
lock_wait(m_SoundLock);
m_SoundVolume = WantedVolume;
lock_release(m_SoundLock);
}
return 0;
}
@ -277,7 +277,7 @@ void CSound::RateConvert(int SampleID)
CSample *pSample = &m_aSamples[SampleID];
int NumFrames = 0;
short *pNewData = 0;
// make sure that we need to convert this sound
if(!pSample->m_pData || pSample->m_Rate == m_MixingRate)
return;
@ -285,7 +285,7 @@ void CSound::RateConvert(int SampleID)
// allocate new data
NumFrames = (int)((pSample->m_NumFrames/(float)pSample->m_Rate)*m_MixingRate);
pNewData = (short *)mem_alloc(NumFrames*pSample->m_Channels*sizeof(short), 1);
for(int i = 0; i < NumFrames; i++)
{
// resample TODO: this should be done better, like linear atleast
@ -293,7 +293,7 @@ void CSound::RateConvert(int SampleID)
int f = (int)(a*pSample->m_NumFrames);
if(f >= pSample->m_NumFrames)
f = pSample->m_NumFrames-1;
// set new data
if(pSample->m_Channels == 1)
pNewData[i] = pSample->m_pData[f];
@ -303,7 +303,7 @@ void CSound::RateConvert(int SampleID)
pNewData[i*2+1] = pSample->m_pData[f*2+1];
}
}
// free old data and apply new
mem_free(pSample->m_pData);
pSample->m_pData = pNewData;
@ -321,15 +321,15 @@ int CSound::LoadWV(const char *pFilename)
int SampleID = -1;
char aError[100];
WavpackContext *pContext;
// don't waste memory on sound when we are stress testing
if(g_Config.m_DbgStress)
return -1;
// no need to load sound when we are running with no sound
if(!m_SoundEnabled)
return 1;
if(!m_pStorage)
return -1;
@ -372,7 +372,7 @@ int CSound::LoadWV(const char *pFilename)
dbg_msg("sound/wv", "file is %d Hz, not 44100 Hz. filename='%s'", snd->rate, filename);
return -1;
}*/
if(BitsPerSample != 16)
{
dbg_msg("sound/wv", "bps is %d, not 16, filname='%s'", BitsPerSample, pFilename);
@ -382,7 +382,7 @@ int CSound::LoadWV(const char *pFilename)
pData = (int *)mem_alloc(4*m_aSamples*m_aChannels, 1);
WavpackUnpackSamples(pContext, pData, m_aSamples); // TODO: check return value
pSrc = pData;
pSample->m_pData = (short *)mem_alloc(2*m_aSamples*m_aChannels, 1);
pDst = pSample->m_pData;
@ -428,9 +428,9 @@ int CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
{
int VoiceID = -1;
int i;
lock_wait(m_SoundLock);
// search for voice
for(i = 0; i < NUM_VOICES; i++)
{
@ -442,7 +442,7 @@ int CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
break;
}
}
// voice found, use it
if(VoiceID != -1)
{
@ -457,7 +457,7 @@ int CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
m_aVoices[VoiceID].m_X = (int)x;
m_aVoices[VoiceID].m_Y = (int)y;
}
lock_release(m_SoundLock);
return VoiceID;
}

2
src/engine/docs/client_time.txt
View file

@ -6,6 +6,6 @@ predtick, predintratick
prevtick tick predtick
4 8 14
|---------------------|---------------------|
0 <- intratick -> 1
0 <- intratick -> 1
0 <- ticktime(in s)-> X
0 <- predintratick?-> 1

2
src/engine/docs/prediction.txt
View file

@ -8,7 +8,7 @@ Predicted input sent to the server can be retrived by calling <client_get_input>
> {
> int tick;
> prediction_reset();
>
>
> for(tick = client_tick()+1; tick <= client_predtick(); tick++)
> {
> MY_INPUT *input = (MY_INPUT *)client_get_input();

4
src/engine/docs/server_op.txt
View file

@ -25,13 +25,13 @@ while running
send snapshot
end for
end
process new network messages
end while
unload map
(end)
Section: Reinit

2
src/engine/docs/snapshots.txt
View file

@ -48,7 +48,7 @@ After a snapshot have been created, compression is applyed to reduce the bandwid
Topic: Interval
The interval for how often a client recives a snapshot changes during the course of the connection. There are three different snapshot rates.
The interval for how often a client recives a snapshot changes during the course of the connection. There are three different snapshot rates.
- *Init*. 5 snapshots per second. Used when a client is connecting and used until the client has acknowlaged a snapshot. This mechanism is used because the first snapshot because no delta compression can be done.

2
src/engine/server/server.cpp
View file

@ -672,7 +672,7 @@ void CServer::SendRconCmdRem(const IConsole::CCommandInfo *pCommandInfo, int Cli
void CServer::UpdateClientRconCommands()
{
int ClientID = Tick() % MAX_CLIENTS;
if(m_aClients[ClientID].m_State != CClient::STATE_EMPTY && m_aClients[ClientID].m_Authed)
{
int ConsoleAccessLevel = m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : IConsole::ACCESS_LEVEL_MOD;

2
src/engine/serverbrowser.h
View file

@ -24,7 +24,7 @@ public:
int m_Country;
int m_Score;
bool m_Player;
int m_FriendState;
};

8
src/engine/shared/console.cpp
View file

@ -665,7 +665,7 @@ void CConsole::Register(const char *pName, const char *pParams,
pCommand->m_pName = pName;
pCommand->m_pHelp = pHelp;
pCommand->m_pParams = pParams;
pCommand->m_Flags = Flags;
pCommand->m_Temp = false;
@ -699,7 +699,7 @@ void CConsole::RegisterTemp(const char *pName, const char *pParams, int Flags, c
}
pCommand->m_pfnCallback = 0;
pCommand->m_pUserData = 0;
pCommand->m_pUserData = 0;
pCommand->m_Flags = Flags;
pCommand->m_Temp = true;
@ -729,7 +729,7 @@ void CConsole::DeregisterTemp(const char *pName)
break;
}
}
// add to recycle list
if(pRemoved)
{
@ -742,7 +742,7 @@ void CConsole::DeregisterTempAll()
{
// set non temp as first one
for(; m_pFirstCommand && m_pFirstCommand->m_Temp; m_pFirstCommand = m_pFirstCommand->m_pNext);
// remove temp entries from command list
for(CCommand *pCommand = m_pFirstCommand; pCommand && pCommand->m_pNext; pCommand = pCommand->m_pNext)
{

2
src/engine/shared/demo.cpp
View file

@ -775,7 +775,7 @@ void CDemoPlayer::GetDemoName(char *pBuffer, int BufferSize) const
else if(*pFileName == '.')
pEnd = pFileName;
}
int Length = pEnd > pExtractedName ? min(BufferSize, (int)(pEnd-pExtractedName+1)) : BufferSize;
str_copy(pBuffer, pExtractedName, Length);
}

2
src/engine/shared/masterserver.cpp
View file

@ -157,7 +157,7 @@ public:
Added = true;
break;
}
if(!Added)
{
for(int i = 0; i < MAX_MASTERSERVERS; ++i)

6
src/engine/shared/network_console.cpp
View file

@ -56,7 +56,7 @@ int CNetConsole::AcceptClient(NETSOCKET Socket, const NETADDR *pAddr)
{
char aError[256] = { 0 };
int FreeSlot = -1;
// look for free slot or multiple client
for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; i++)
{
@ -115,7 +115,7 @@ int CNetConsole::Update()
}
else
str_format(aBuf, sizeof(aBuf), "You have been banned for life");
net_tcp_send(Socket, aBuf, str_length(aBuf));
net_tcp_close(Socket);
}
@ -170,7 +170,7 @@ bool CNetConsole::AddBan(NETADDR Addr, int Seconds)
{
if(m_NumBans == MAX_BANS)
return false;
Addr.port = 0;
int Index = FindBan(Addr);
if(Index == -1)

2
src/engine/shared/network_console_conn.cpp
View file

@ -181,6 +181,6 @@ int CConsoleNetConnection::Send(const char *pLine)
pData += Send;
Length -= Send;
}
return 0;
}

4
src/engine/sound.h
View file

@ -19,10 +19,10 @@ public:
virtual bool IsSoundEnabled() = 0;
virtual int LoadWV(const char *pFilename) = 0;
virtual void SetChannel(int ChannelID, float Volume, float Panning) = 0;
virtual void SetListenerPos(float x, float y) = 0;
virtual int PlayAt(int ChannelID, int SampleID, int Flags, float x, float y) = 0;
virtual int Play(int ChannelID, int SampleID, int Flags) = 0;
virtual void Stop(int SampleID) = 0;

2
src/game/client/components/chat.cpp
View file

@ -283,7 +283,7 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
m_aLines[m_CurrentLine].m_ClientID = ClientID;
m_aLines[m_CurrentLine].m_Team = Team;
m_aLines[m_CurrentLine].m_NameColor = -2;
// check for highlighted name
const char *pHL = str_find_nocase(pLine, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_aName);
if(pHL)

2
src/game/client/components/hud.cpp
View file

@ -108,7 +108,7 @@ void CHud::RenderScoreHud()
if(GameFlags&GAMEFLAG_FLAGS)
{
int BlinkTimer = (m_pClient->m_FlagDropTick[t] != 0 &&
int BlinkTimer = (m_pClient->m_FlagDropTick[t] != 0 &&
(Client()->GameTick()-m_pClient->m_FlagDropTick[t])/Client()->GameTickSpeed() >= 25) ? 10 : 20;
if(FlagCarrier[t] == FLAG_ATSTAND || (FlagCarrier[t] == FLAG_TAKEN && ((Client()->GameTick()/BlinkTimer)&1)))
{

2
src/game/client/components/menus.cpp
View file

@ -1108,7 +1108,7 @@ int CMenus::Render()
Box.HSplitBottom(24.f, &Box, &Part);
Box.HSplitBottom(20.f, &Box, 0);
Box.VMargin(20.0f, &Box);
static int ActSelection = -2;
if(ActSelection == -2)
ActSelection = g_Config.m_BrFilterCountryIndex;

4
src/game/client/components/menus_browser.cpp
View file

@ -516,7 +516,7 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
ServerFilter.HSplitTop(20.0f, &Button, &ServerFilter);
if (DoButton_CheckBox((char *)&g_Config.m_BrFilterPureMap, Localize("Standard map"), g_Config.m_BrFilterPureMap, &Button))
g_Config.m_BrFilterPureMap ^= 1;
ServerFilter.HSplitTop(20.0f, &Button, &ServerFilter);
if (DoButton_CheckBox((char *)&g_Config.m_BrFilterGametypeStrict, Localize("Strict gametype filter"), g_Config.m_BrFilterGametypeStrict, &Button))
g_Config.m_BrFilterGametypeStrict ^= 1;
@ -563,7 +563,7 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
Button.HMargin(3.0f, &Button);
if(DoButton_CheckBox(&g_Config.m_BrFilterCountry, Localize("Player country:"), g_Config.m_BrFilterCountry, &Button))
g_Config.m_BrFilterCountry ^= 1;
float OldWidth = Rect.w;
Rect.w = Rect.h*2;
Rect.x += (OldWidth-Rect.w)/2.0f;

2
src/game/client/components/menus_ingame.cpp
View file

@ -391,7 +391,7 @@ void CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
{
if(!m_pClient->m_Snap.m_paInfoByTeam[i])
continue;
int Index = m_pClient->m_Snap.m_paInfoByTeam[i]->m_ClientID;
if(Index == m_pClient->m_Snap.m_LocalClientID || FilterSpectators && m_pClient->m_Snap.m_paInfoByTeam[i]->m_Team == TEAM_SPECTATORS)
continue;

4
src/game/client/components/menus_settings.cpp
View file

@ -543,7 +543,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
WeaponSettings.HSplitTop(14.0f+5.0f+10.0f, 0, &WeaponSettings);
UiDoGetButtons(5, 12, WeaponSettings);
}
// defaults
{
ResetButton.HSplitTop(10.0f, 0, &ResetButton);
@ -554,7 +554,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
if(DoButton_Menu((void*)&s_DefaultButton, Localize("Reset to defaults"), 0, &ResetButton))
m_pClient->m_pBinds->SetDefaults();
}
// voting settings
{
VotingSettings.VSplitLeft(10.0f, 0, &VotingSettings);

6
src/game/client/components/sounds.cpp
View file

@ -144,7 +144,7 @@ void CSounds::Play(int Chn, int SetId, float Vol, vec2 Pos)
if(!pSet->m_NumSounds)
return;
int Flags = 0;
if(Chn == CHN_MUSIC)
Flags = ISound::FLAG_LOOP;
@ -170,9 +170,9 @@ void CSounds::Stop(int SetId)
{
if(m_WaitForSoundJob || SetId < 0 || SetId >= g_pData->m_NumSounds)
return;
CDataSoundset *pSet = &g_pData->m_aSounds[SetId];
for(int i = 0; i < pSet->m_NumSounds; i++)
Sound()->Stop(pSet->m_aSounds[i].m_Id);
}

50
src/game/editor/auto_map.cpp
View file

@ -20,15 +20,15 @@ void CAutoMapper::Load(const char* pTileName)
IOHANDLE RulesFile = m_pEditor->Storage()->OpenFile(aPath, IOFLAG_READ, IStorage::TYPE_ALL);
if(!RulesFile)
return;
CLineReader LineReader;
LineReader.Init(RulesFile);
CConfiguration *pCurrentConf = 0;
CIndexRule *pCurrentIndex = 0;
char aBuf[256];
// read each line
while(char *pLine = LineReader.Get())
{
@ -40,11 +40,11 @@ void CAutoMapper::Load(const char* pTileName)
{
// new configuration, get the name
pLine++;
CConfiguration NewConf;
int ID = m_lConfigs.add(NewConf);
pCurrentConf = &m_lConfigs[ID];
str_copy(pCurrentConf->m_aName, pLine, str_length(pLine));
}
else
@ -54,15 +54,15 @@ void CAutoMapper::Load(const char* pTileName)
// new index
int ID = 0;
char aFlip[128] = "";
sscanf(pLine, "Index %d %127s", &ID, aFlip);
CIndexRule NewIndexRule;
NewIndexRule.m_ID = ID;
NewIndexRule.m_Flag = 0;
NewIndexRule.m_RandomValue = 0;
NewIndexRule.m_BaseTile = false;
if(str_length(aFlip) > 0)
{
if(!str_comp(aFlip, "XFLIP"))
@ -70,7 +70,7 @@ void CAutoMapper::Load(const char* pTileName)
else if(!str_comp(aFlip, "YFLIP"))
NewIndexRule.m_Flag = TILEFLAG_HFLIP;
}
// add the index rule object and make it current
int ArrayID = pCurrentConf->m_aIndexRules.add(NewIndexRule);
pCurrentIndex = &pCurrentConf->m_aIndexRules[ArrayID];
@ -85,9 +85,9 @@ void CAutoMapper::Load(const char* pTileName)
char aValue[128];
int Value = CPosRule::EMPTY;
bool IndexValue = false;
sscanf(pLine, "Pos %d %d %127s", &x, &y, aValue);
if(!str_comp(aValue, "FULL"))
Value = CPosRule::FULL;
else if(!str_comp_num(aValue, "INDEX", 5))
@ -106,12 +106,12 @@ void CAutoMapper::Load(const char* pTileName)
}
}
}
io_close(RulesFile);
str_format(aBuf, sizeof(aBuf),"loaded %s", aPath);
m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor", aBuf);
m_FileLoaded = true;
}
@ -127,14 +127,14 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
{
if(!m_FileLoaded || pLayer->m_Readonly || ConfigID < 0 || ConfigID >= m_lConfigs.size())
return;
CConfiguration *pConf = &m_lConfigs[ConfigID];
if(!pConf->m_aIndexRules.size())
return;
int BaseTile = 1;
// find base tile if there is one
for(int i = 0; i < pConf->m_aIndexRules.size(); ++i)
{
@ -144,7 +144,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
break;
}
}
// auto map !
int MaxIndex = pLayer->m_Width*pLayer->m_Height;
for(int y = 0; y < pLayer->m_Height; y++)
@ -159,7 +159,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
if(y == 0 || y == pLayer->m_Height-1 || x == 0 || x == pLayer->m_Width-1)
continue;
for(int i = 0; i < pConf->m_aIndexRules.size(); ++i)
{
if(pConf->m_aIndexRules[i].m_BaseTile)
@ -170,7 +170,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
{
CPosRule *pRule = &pConf->m_aIndexRules[i].m_aRules[j];
int CheckIndex = (y+pRule->m_Y)*pLayer->m_Width+(x+pRule->m_X);
if(CheckIndex < 0 || CheckIndex >= MaxIndex)
RespectRules = false;
else
@ -184,15 +184,15 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
{
if(pLayer->m_pTiles[CheckIndex].m_Index > 0 && pRule->m_Value == CPosRule::EMPTY)
RespectRules = false;
if(pLayer->m_pTiles[CheckIndex].m_Index == 0 && pRule->m_Value == CPosRule::FULL)
RespectRules = false;
}
}
}
if(RespectRules &&
(pConf->m_aIndexRules[i].m_RandomValue <= 1 || (int)((float)rand() / ((float)RAND_MAX + 1) * pConf->m_aIndexRules[i].m_RandomValue) == 1))
(pConf->m_aIndexRules[i].m_RandomValue <= 1 || (int)((float)rand() / ((float)RAND_MAX + 1) * pConf->m_aIndexRules[i].m_RandomValue) == 1))
{
pTile->m_Index = pConf->m_aIndexRules[i].m_ID;
pTile->m_Flags = pConf->m_aIndexRules[i].m_Flag;

8
src/game/editor/auto_map.h
View file

@ -11,7 +11,7 @@ class CAutoMapper
int m_Y;
int m_Value;
bool m_IndexValue;
enum
{
EMPTY=0,
@ -33,16 +33,16 @@ class CAutoMapper
array<CIndexRule> m_aIndexRules;
char m_aName[128];
};
public:
CAutoMapper(class CEditor *pEditor);
void Load(const char* pTileName);
void Proceed(class CLayerTiles *pLayer, int ConfigID);
int ConfigNamesNum() { return m_lConfigs.size(); }
const char* GetConfigName(int Index);
const bool IsLoaded() { return m_FileLoaded; }
private:
array<CConfiguration> m_lConfigs;

130
src/game/editor/editor.cpp
View file

@ -164,7 +164,7 @@ void CEditorImage::AnalyseTileFlags()
int tw = m_Width/16; // tilesizes
int th = m_Height/16;
if ( tw == th )
{
{
unsigned char *pPixelData = (unsigned char *)m_pData;
int TileID = 0;
@ -381,8 +381,8 @@ float CEditor::UiDoScrollbarV(const void *pID, const CUIRect *pRect, float Curre
Handle.y += (pRect->h-Handle.h)*Current;
// logic
float Ret = Current;
int Inside = UI()->MouseInside(&Handle);
float Ret = Current;
int Inside = UI()->MouseInside(&Handle);
if(UI()->ActiveItem() == pID)
{
@ -423,7 +423,7 @@ float CEditor::UiDoScrollbarV(const void *pID, const CUIRect *pRect, float Curre
Slider.Margin(5.0f, &Slider);
RenderTools()->DrawUIRect(&Slider, vec4(1,1,1,0.25f)*ButtonColorMul(pID), CUI::CORNER_ALL, 2.5f);
return Ret;
return Ret;
}
vec4 CEditor::GetButtonColor(const void *pID, int Checked)
@ -490,7 +490,7 @@ int CEditor::DoButton_File(const void *pID, const char *pText, int Checked, cons
int CEditor::DoButton_Menu(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
{
CUIRect r = *pRect;
RenderTools()->DrawUIRect(&r, vec4(0.5f, 0.5f, 0.5f, 1.0f), CUI::CORNER_T, 3.0f);
RenderTools()->DrawUIRect(&r, vec4(0.5f, 0.5f, 0.5f, 1.0f), CUI::CORNER_T, 3.0f);
r = *pRect;
r.VMargin(5.0f, &r);
@ -515,18 +515,18 @@ int CEditor::DoButton_MenuItem(const void *pID, const char *pText, int Checked,
int CEditor::DoButton_Tab(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
{
RenderTools()->DrawUIRect(pRect, GetButtonColor(pID, Checked), CUI::CORNER_T, 5.0f);
CUIRect NewRect = *pRect;
NewRect.y += NewRect.h/2.0f-7.0f;
UI()->DoLabel(&NewRect, pText, 10, 0, -1);
CUIRect NewRect = *pRect;
NewRect.y += NewRect.h/2.0f-7.0f;
UI()->DoLabel(&NewRect, pText, 10, 0, -1);
return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
}
int CEditor::DoButton_Ex(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize)
{
RenderTools()->DrawUIRect(pRect, GetButtonColor(pID, Checked), Corners, 3.0f);
CUIRect NewRect = *pRect;
NewRect.HMargin(NewRect.h/2.0f-FontSize/2.0f-1.0f, &NewRect);
UI()->DoLabel(&NewRect, pText, FontSize, 0, -1);
CUIRect NewRect = *pRect;
NewRect.HMargin(NewRect.h/2.0f-FontSize/2.0f-1.0f, &NewRect);
UI()->DoLabel(&NewRect, pText, FontSize, 0, -1);
return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
}
@ -550,7 +550,7 @@ void CEditor::RenderGrid(CLayerGroup *pGroup)
return;
float aGroupPoints[4];
pGroup->Mapping(aGroupPoints);
pGroup->Mapping(aGroupPoints);
float w = UI()->Screen()->w;
float h = UI()->Screen()->h;
@ -562,7 +562,7 @@ void CEditor::RenderGrid(CLayerGroup *pGroup)
int XGridOffset = XOffset % m_GridFactor;
int YGridOffset = YOffset % m_GridFactor;
Graphics()->TextureSet(-1);
Graphics()->TextureSet(-1);
Graphics()->LinesBegin();
for(int i = 0; i < (int)w; i++)
@ -601,9 +601,9 @@ void CEditor::RenderBackground(CUIRect View, int Texture, float Size, float Brig
int CEditor::UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip)
{
// logic
static float s_Value;
int Inside = UI()->MouseInside(pRect);
// logic
static float s_Value;
int Inside = UI()->MouseInside(pRect);
if(UI()->ActiveItem() == pID)
{
@ -652,9 +652,9 @@ int CEditor::UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, in
char aBuf[128];
str_format(aBuf, sizeof(aBuf),"%s %d", pLabel, Current);
RenderTools()->DrawUIRect(pRect, GetButtonColor(pID, 0), CUI::CORNER_ALL, 5.0f);
pRect->y += pRect->h/2.0f-7.0f;
UI()->DoLabel(pRect, aBuf, 10, 0, -1);
pRect->y += pRect->h/2.0f-7.0f;
UI()->DoLabel(pRect, aBuf, 10, 0, -1);
return Current;
}
@ -713,7 +713,7 @@ void CEditor::CallbackAppendMap(const char *pFileName, int StorageType, void *pU
pEditor->m_aFileName[0] = 0;
else
pEditor->SortImages();
pEditor->m_Dialog = DIALOG_NONE;
}
void CEditor::CallbackSaveMap(const char *pFileName, int StorageType, void *pUser)
@ -734,7 +734,7 @@ void CEditor::CallbackSaveMap(const char *pFileName, int StorageType, void *pUse
pEditor->m_ValidSaveFilename = StorageType == IStorage::TYPE_SAVE && pEditor->m_pFileDialogPath == pEditor->m_aFileDialogCurrentFolder;
pEditor->m_Map.m_Modified = false;
}
pEditor->m_Dialog = DIALOG_NONE;
}
@ -742,11 +742,11 @@ void CEditor::DoToolbar(CUIRect ToolBar)
{
CUIRect TB_Top, TB_Bottom;
CUIRect Button;
ToolBar.HSplitTop(ToolBar.h/2.0f, &TB_Top, &TB_Bottom);
TB_Top.HSplitBottom(2.5f, &TB_Top, 0);
TB_Bottom.HSplitTop(2.5f, 0, &TB_Bottom);
TB_Top.HSplitBottom(2.5f, &TB_Top, 0);
TB_Bottom.HSplitTop(2.5f, 0, &TB_Bottom);
// ctrl+o to open
if(Input()->KeyDown('o') && (Input()->KeyPressed(KEY_LCTRL) || Input()->KeyPressed(KEY_RCTRL)))
@ -763,7 +763,7 @@ void CEditor::DoToolbar(CUIRect ToolBar)
// ctrl+s to save
if(Input()->KeyDown('s') && (Input()->KeyPressed(KEY_LCTRL) || Input()->KeyPressed(KEY_RCTRL)))
{
if(m_aFileName[0] && m_ValidSaveFilename)
if(m_aFileName[0] && m_ValidSaveFilename)
{
str_copy(m_aFileSaveName, m_aFileName, sizeof(m_aFileSaveName));
m_PopupEventType = POPEVENT_SAVE;
@ -947,13 +947,13 @@ void CEditor::DoToolbar(CUIRect ToolBar)
}
}
}
// tile manipulation
{
TB_Bottom.VSplitLeft(40.0f, &Button, &TB_Bottom);
static int s_BorderBut = 0;
CLayerTiles *pT = (CLayerTiles *)GetSelectedLayerType(0, LAYERTYPE_TILES);
if(DoButton_Editor(&s_BorderBut, "Border", pT?0:-1, &Button, 0, "Adds border tiles"))
{
if(pT)
@ -1102,14 +1102,14 @@ void CEditor::DoQuad(CQuad *q, int Index)
y = (int)((wy+(LineDistance/2)*m_GridFactor)/(LineDistance*m_GridFactor)) * (LineDistance*m_GridFactor);
else
y = (int)((wy-(LineDistance/2)*m_GridFactor)/(LineDistance*m_GridFactor)) * (LineDistance*m_GridFactor);
int OldX = q->m_aPoints[4].x;
int OldY = q->m_aPoints[4].y;
q->m_aPoints[4].x = f2fx(x);
q->m_aPoints[4].y = f2fx(y);
int DiffX = q->m_aPoints[4].x - OldX;
int DiffY = q->m_aPoints[4].y - OldY;
for(int v = 0; v < 4; v++)
{
q->m_aPoints[v].x += DiffX;
@ -1198,7 +1198,7 @@ void CEditor::DoQuad(CQuad *q, int Index)
{
if(m_SelectedQuad != Index)
m_SelectedPoints = 0;
m_SelectedQuad = Index;
m_SelectedQuad = Index;
s_Operation = OP_CONTEXT_MENU;
UI()->SetActiveItem(pID);
}
@ -1295,12 +1295,12 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
for(int m = 0; m < 4; m++)
if(m_SelectedPoints&(1<<m))
{
// 0,2;1,3 - line x
// 0,2;1,3 - line x
// 0,1;2,3 - line y
pQuad->m_aTexcoords[m].x += f2fx(dx*0.001f);
pQuad->m_aTexcoords[(m+2)%4].x += f2fx(dx*0.001f);
pQuad->m_aTexcoords[m].y += f2fx(dy*0.001f);
pQuad->m_aTexcoords[m^1].y += f2fx(dy*0.001f);
}
@ -1590,8 +1590,8 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
{
if(!UI()->MouseButton(0))
{
for(int k = 0; k < NumEditLayers; k++)
pEditLayers[k]->FillSelection(m_Brush.IsEmpty(), m_Brush.m_lLayers[0], r);
for(int k = 0; k < NumEditLayers; k++)
pEditLayers[k]->FillSelection(m_Brush.IsEmpty(), m_Brush.m_lLayers[0], r);
}
else
{
@ -1623,10 +1623,10 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
}
}
CLayerTiles *pLayer = (CLayerTiles*)GetSelectedLayerType(0, LAYERTYPE_TILES);
if((Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT)) && pLayer)
s_Operation = OP_BRUSH_PAINT;
s_Operation = OP_BRUSH_PAINT;
}
if(!m_Brush.IsEmpty())
@ -1736,7 +1736,7 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
{
CLayerGroup *g = m_Map.m_pGameGroup;
g->MapScreen();
Graphics()->TextureSet(-1);
Graphics()->LinesBegin();
@ -1935,7 +1935,7 @@ int CEditor::DoProperties(CUIRect *pToolBox, CProperty *pProps, int *pIDs, int *
if(pProps[i].m_Value < 0)
str_copy(aBuf, "None", sizeof(aBuf));
else
str_format(aBuf, sizeof(aBuf),"%s", m_Map.m_lImages[pProps[i].m_Value]->m_aName);
str_format(aBuf, sizeof(aBuf),"%s", m_Map.m_lImages[pProps[i].m_Value]->m_aName);
if(DoButton_Editor(&pIDs[i], aBuf, 0, &Shifter, 0, 0))
PopupSelectImageInvoke(pProps[i].m_Value, UI()->MouseX(), UI()->MouseY());
@ -2174,8 +2174,8 @@ void CEditor::ReplaceImage(const char *pFileName, int StorageType, void *pUser)
pEditor->SortImages();
for(int i = 0; i < pEditor->m_Map.m_lImages.size(); ++i)
{
if(!str_comp(pEditor->m_Map.m_lImages[i]->m_aName, pImg->m_aName))
pEditor->m_SelectedImage = i;
if(!str_comp(pEditor->m_Map.m_lImages[i]->m_aName, pImg->m_aName))
pEditor->m_SelectedImage = i;
}
pEditor->m_Dialog = DIALOG_NONE;
}
@ -2192,8 +2192,8 @@ void CEditor::AddImage(const char *pFileName, int StorageType, void *pUser)
ExtractName(pFileName, aBuf, sizeof(aBuf));
for(int i = 0; i < pEditor->m_Map.m_lImages.size(); ++i)
{
if(!str_comp(pEditor->m_Map.m_lImages[i]->m_aName, aBuf))
return;
if(!str_comp(pEditor->m_Map.m_lImages[i]->m_aName, aBuf))
return;
}
CEditorImage *pImg = new CEditorImage(pEditor);
@ -2319,7 +2319,7 @@ void CEditor::SortImages()
gs_pSortedIndex = 0;
}
}
void CEditor::RenderImages(CUIRect ToolBox, CUIRect ToolBar, CUIRect View)
{
@ -2750,7 +2750,7 @@ void CEditor::InvokeFileDialog(int StorageType, int FileType, const char *pTitle
str_copy(m_aFileDialogFileName, pDefaultName, sizeof(m_aFileDialogFileName));
if(pBasePath)
str_copy(m_aFileDialogCurrentFolder, pBasePath, sizeof(m_aFileDialogCurrentFolder));
FilelistPopulate(m_FileDialogStorageType);
m_Dialog = DIALOG_FILE;
@ -2770,10 +2770,10 @@ void CEditor::RenderModebar(CUIRect View)
const char *pButName = m_Mode == MODE_LAYERS ? "Layers" : "Images";
if(DoButton_Tab(&s_Button, pButName, 0, &Button, 0, "Switch between images and layers managment."))
{
if(m_Mode == MODE_LAYERS)
m_Mode = MODE_IMAGES;
else
m_Mode = MODE_LAYERS;
if(m_Mode == MODE_LAYERS)
m_Mode = MODE_IMAGES;
else
m_Mode = MODE_LAYERS;
}
}
@ -3127,7 +3127,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
UI()->SetActiveItem(0);
}
else
{
{
if(Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT))
{
if(i != 0)
@ -3482,12 +3482,12 @@ void CEditor::Reset(bool CreateDefault)
m_SelectedPoints = 0;
m_SelectedEnvelope = 0;
m_SelectedImage = 0;
m_WorldOffsetX = 0;
m_WorldOffsetY = 0;
m_EditorOffsetX = 0.0f;
m_EditorOffsetY = 0.0f;
m_WorldZoom = 1.0f;
m_ZoomLevel = 200;
@ -3633,19 +3633,19 @@ void CEditor::Init()
void CEditor::DoMapBorder()
{
CLayerTiles *pT = (CLayerTiles *)GetSelectedLayerType(0, LAYERTYPE_TILES);
for(int i = 0; i < pT->m_Width*2; ++i)
pT->m_pTiles[i].m_Index = 1;
for(int i = 0; i < pT->m_Width*pT->m_Height; ++i)
{
if(i%pT->m_Width < 2 || i%pT->m_Width > pT->m_Width-3)
pT->m_pTiles[i].m_Index = 1;
}
for(int i = (pT->m_Width*(pT->m_Height-2)); i < pT->m_Width*pT->m_Height; ++i)
pT->m_pTiles[i].m_Index = 1;
CLayerTiles *pT = (CLayerTiles *)GetSelectedLayerType(0, LAYERTYPE_TILES);
for(int i = 0; i < pT->m_Width*2; ++i)
pT->m_pTiles[i].m_Index = 1;
for(int i = 0; i < pT->m_Width*pT->m_Height; ++i)
{
if(i%pT->m_Width < 2 || i%pT->m_Width > pT->m_Width-3)
pT->m_pTiles[i].m_Index = 1;
}
for(int i = (pT->m_Width*(pT->m_Height-2)); i < pT->m_Width*pT->m_Height; ++i)
pT->m_pTiles[i].m_Index = 1;
}
void CEditor::UpdateAndRender()

2
src/game/editor/editor.h
View file

@ -713,7 +713,7 @@ public:
void PopupSelectGametileOpInvoke(float x, float y);
int PopupSelectGameTileOpResult();
void PopupSelectConfigAutoMapInvoke(float x, float y);
int PopupSelectConfigAutoMapResult();

4
src/game/editor/layer_tiles.cpp
View file

@ -363,7 +363,7 @@ void CLayerTiles::ShowInfo()
int CLayerTiles::RenderProperties(CUIRect *pToolBox)
{
CUIRect Button;
bool InGameGroup = !find_linear(m_pEditor->m_Map.m_pGameGroup->m_lLayers.all(), this).empty();
if(m_pEditor->m_Map.m_pGameLayer != this)
{
@ -373,7 +373,7 @@ int CLayerTiles::RenderProperties(CUIRect *pToolBox)
pToolBox->HSplitBottom(12.0f, pToolBox, &Button);
if(m_pEditor->DoButton_Editor(&s_AutoMapperButton, "Auto map", 0, &Button, 0, ""))
m_pEditor->PopupSelectConfigAutoMapInvoke(m_pEditor->UI()->MouseX(), m_pEditor->UI()->MouseY());
int Result = m_pEditor->PopupSelectConfigAutoMapResult();
if(Result > -1)
{

4
src/game/editor/popups.cpp
View file

@ -811,7 +811,7 @@ int CEditor::PopupSelectConfigAutoMap(CEditor *pEditor, CUIRect View)
CUIRect Button;
static int s_AutoMapperConfigButtons[256];
CAutoMapper *pAutoMapper = &pEditor->m_Map.m_lImages[pLayer->m_Image]->m_AutoMapper;
for(int i = 0; i < pAutoMapper->ConfigNamesNum(); ++i)
{
View.HSplitTop(2.0f, 0, &View);
@ -837,7 +837,7 @@ int CEditor::PopupSelectConfigAutoMapResult()
{
if(s_AutoMapConfigSelected < 0)
return -1;
int Result = s_AutoMapConfigSelected;
s_AutoMapConfigSelected = -1;
return Result;

2
src/tools/dilate.cpp
View file

@ -96,7 +96,7 @@ int main(int argc, const char **argv)
dbg_msg("Usage", "%s FILE1 [ FILE2... ]", argv[0]);
return -1;
}
for(int i = 1; i < argc; i++)
DilateFile(argv[i]);
return 0;