zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- GCC compile fix and warning removal. 

SVN r1434 (trunk)
This commit is contained in:
Christoph Oelckers 2009-02-21 21:44:15 +00:00
parent b94b832a9e
commit 5bb3f87746
4 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/r_things.cpp
View File

@ -776,9 +776,6 @@ void R_InitSkins (void)
// [RH] Find a skin by name
int R_FindSkin (const char *name, int pclass)
{
int min, max, mid;
int lexx;
if (stricmp ("base", name) == 0)
{
return pclass;
@ -788,39 +785,12 @@ int R_FindSkin (const char *name, int pclass)
{
if (strnicmp (skins[i].name, name, 16) == 0)
{
if (PlayerClasses[pclass].CheckSkin (mid))
if (PlayerClasses[pclass].CheckSkin (i))
return i;
else
return pclass;
}
}
/*
min = PlayerClasses.Size ();
max = (int)numskins-1;
while (min <= max)
{
mid = (min + max)/2;
lexx = strnicmp (skins[mid].name, name, 16);
if (lexx == 0)
{
if (PlayerClasses[pclass].CheckSkin (mid))
return mid;
else
return pclass;
}
else if (lexx < 0)
{
min = mid + 1;
}
else
{
max = mid - 1;
}
}
*/
return pclass;
}

2
src/thingdef/thingdef.cpp
View File

@ -78,7 +78,7 @@ PSymbolTable GlobalSymbols;
// Starts a new actor definition
//
//==========================================================================
FActorInfo *CreateNewActor(FScriptPosition &sc, FName typeName, FName parentName, bool native)
FActorInfo *CreateNewActor(const FScriptPosition &sc, FName typeName, FName parentName, bool native)
{
const PClass *replacee = NULL;
PClass *ti = NULL;

2
src/thingdef/thingdef.h
View File

@ -189,7 +189,7 @@ PSymbolActionFunction *FindGlobalActionFunction(const char *name);
//
//==========================================================================
FActorInfo *CreateNewActor(FScriptPosition &sc, FName typeName, FName parentName, bool native);
FActorInfo *CreateNewActor(const FScriptPosition &sc, FName typeName, FName parentName, bool native);
void SetReplacement(FActorInfo *info, FName replaceName);
void HandleActorFlag(FScanner &sc, Baggage &bag, const char *part1, const char *part2, int mod);

2
src/thingdef/thingdef_parse.cpp
View File

@ -965,7 +965,7 @@ static FActorInfo *ParseActorHeader(FScanner &sc, Baggage *bag)
try
{
FActorInfo *info = CreateNewActor(FScriptPosition(sc), typeName, parentName, native);
FActorInfo *info = CreateNewActor(sc, typeName, parentName, native);
info->DoomEdNum = DoomEdNum > 0? DoomEdNum : -1;
SetReplacement(info, replaceName);