Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[-] Removed obsolete CclSetMetaServer

Browse source 
[-] Fixed button popup line color
This commit is contained in:
cybermind 2015-02-14 20:23:35 +05:00
parent 881a3dd830
commit 15c177ef90
4 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/include/master.h
View file

@ -77,8 +77,6 @@ private:
----------------------------------------------------------------------------*/
// Metaserver itself
extern CMetaClient MetaClient;
// Warning: deprecated function
extern int CclSetMetaServer(lua_State *l);
//@}

14
src/network/master.cpp
View file

@ -61,20 +61,6 @@ CMetaClient MetaClient;
-- Functions
----------------------------------------------------------------------------*/
/**
** Set the metaserver to use for internet play.
**
** @param l Lua state.
** @warning Deprecated function, need to be removed soon
*/
int CclSetMetaServer(lua_State *l)
{
LuaCheckArgs(l, 2);
MetaClient.SetMetaServer(LuaToString(l, 1), LuaToNumber(l, 2));
return 0;
}
/**
** Set the metaserver to use for internet play.
**

1
src/network/netconnect.cpp
View file

@ -1881,7 +1881,6 @@ static int CclNoRandomPlacementMultiplayer(lua_State *l)
void NetworkCclRegister()
{
lua_register(Lua, "NoRandomPlacementMultiplayer", CclNoRandomPlacementMultiplayer);
lua_register(Lua, "SetMetaServer", CclSetMetaServer);
}

4
src/ui/popup.cpp
View file

@ -10,7 +10,7 @@
//
/**@name popup.cpp - The popup globals. */
//
// (c) Copyright 2012 by Joris Dauphin
// (c) Copyright 2012-2015 by cybermind and Joris Dauphin
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@ -363,7 +363,7 @@ CPopupContentTypeLine::CPopupContentTypeLine() : Color(ColorWhite), Width(0), He
} else if (!strcmp(key, "Height")) {
this->Height = LuaToNumber(l, -1);
} else if (!strcmp(key, "Color")) {
this->Color = LuaToNumber(l, -1);
this->Color = LuaToUnsignedNumber(l, -1);
} else {
LuaError(l, "'%s' invalid for method 'Costs' in DefinePopups" _C_ key);
}