mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-06-08 17:42:05 +00:00
Code Issues Releases Wiki Activity

Win32 resource file update, icons, and one little float->int cast fix in ScriptInterface

Browse source
This commit is contained in:
fgenesis 2013-07-20 00:54:28 +02:00
parent 91bb344c9a
commit 1386e9edb3
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Aquaria/AquariaWin32.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
Aquaria/AquariaWin32Dev.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

2
Aquaria/ScriptInterface.cpp
View file

@ -3835,7 +3835,7 @@ luaFunc(spawnManaBall)
Vector p; Vector p;
p.x = lua_tonumber(L, 1); p.x = lua_tonumber(L, 1);
p.y = lua_tonumber(L, 2); p.y = lua_tonumber(L, 2);
int amount = lua_tonumber(L, 3); float amount = lua_tonumber(L, 3);
dsq->game->spawnManaBall(p, amount); dsq->game->spawnManaBall(p, amount);
luaReturnNil(); luaReturnNil();
} }

17
Aquaria/aquaria.rc
View file

@ -19,11 +19,18 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "AquariaCompileConfig.h"
#include <Winver.h> #include <Winver.h>
#include <Windows.h> #include <Windows.h>
#include "resource.h" // Might as well use what's there, even though it's questionable. #include "resource.h" // Might as well use what's there, even though it's questionable.
#include "custom-fields.h"
#define AQUARIA_RC_FILEVERSION 1,1,3,999
#define AQUARIA_RC_PRODUCTVERSION 1,1,3,0
#define AQUARIA_RC_PRODUCTVERSION_STRING "1.1.3"
#define AQUARIA_RC_COMMENTS AQUARIA_OVERRIDE_VERSION_STRING
#define AQUARIA_RC_FILEVERSION_STRING "1.1.3.fg"
// Version information // Version information
1 VERSIONINFO 1 VERSIONINFO
@ -56,6 +63,12 @@ END
END END
// Icon // Icon
101 ICON "Aquaria.ico" #if defined(AQUARIA_FULL) || defined(AQUARIA_DEMO)
101 ICON "AquariaWin32.ico"
#else
101 ICON "AquariaWin32Dev.ico"
#endif
//101 ICON "Aquaria.ico"