[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3324 - in trunk/pingus: . src src/components src/win32
|
From: |
jsalmon3 |
|
Subject: |
[Pingus-CVS] r3324 - in trunk/pingus: . src src/components src/win32 |
|
Date: |
Thu, 25 Oct 2007 05:19:52 +0200 |
Author: jsalmon3
Date: 2007-10-25 05:19:42 +0200 (Thu, 25 Oct 2007)
New Revision: 3324
Removed:
trunk/pingus/src/win32/resource.h
Modified:
trunk/pingus/pingus.vcproj
trunk/pingus/src/addon_menu.cpp
trunk/pingus/src/components/menu_button.cpp
trunk/pingus/src/level_menu.cpp
trunk/pingus/src/option_menu.cpp
trunk/pingus/src/win32/pingus.rc
Log:
Fixed warnings
Modified: trunk/pingus/pingus.vcproj
===================================================================
--- trunk/pingus/pingus.vcproj 2007-10-25 03:14:42 UTC (rev 3323)
+++ trunk/pingus/pingus.vcproj 2007-10-25 03:19:42 UTC (rev 3324)
@@ -184,6 +184,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File
+ RelativePath=".\src\win32\pingus.rc"
+ >
+ </File>
</Filter>
<Filter
Name="Source Files"
@@ -199,6 +203,14 @@
>
</File>
<File
+ RelativePath=".\src\addon_menu.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\addon_menu.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\blitter.cpp"
>
</File>
@@ -531,6 +543,14 @@
>
</File>
<File
+ RelativePath=".\src\level_menu.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\level_menu.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\line_iterator.cpp"
>
</File>
@@ -551,6 +571,14 @@
>
</File>
<File
+ RelativePath=".\src\option_menu.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\option_menu.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\path_manager.cpp"
>
</File>
@@ -1174,6 +1202,58 @@
Name="display"
>
<File
+ RelativePath=".\src\display\cursor.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\display\cursor.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\display\display.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\display\display.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\display\drawing_context.cpp"
>
</File>
@@ -1484,26 +1564,6 @@
>
</File>
<File
- RelativePath=".\src\gui\cursor.cpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\cursor.hpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\display.cpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\display.hpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\game_delta.hpp"
- >
- </File>
- <File
RelativePath=".\src\gui\game_delta_recorder.hpp"
>
</File>
@@ -1524,14 +1584,6 @@
>
</File>
<File
- RelativePath=".\src\gui\gui_screen.cpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\gui_screen.hpp"
- >
- </File>
- <File
RelativePath=".\src\gui\input_box.cpp"
>
</File>
@@ -1544,42 +1596,6 @@
>
</File>
<File
-
RelativePath=".\src\gui\root_gui_manager.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\gui\root_gui_manager.hpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\screen.cpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\screen.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\gui\screen_manager.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\gui\screen_manager.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\gui\screen_manager_impl.hpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\screen_ptr.cpp"
- >
- </File>
- <File
- RelativePath=".\src\gui\screen_ptr.hpp"
- >
- </File>
- <File
RelativePath=".\src\gui\surface_button.cpp"
>
</File>
@@ -2290,17 +2306,133 @@
>
</File>
<File
- RelativePath=".\src\win32\pingus.rc"
+ RelativePath=".\src\win32\resource.h"
>
</File>
<File
- RelativePath=".\src\win32\resource.h"
+ RelativePath=".\src\win32\uce_dirent.h"
>
</File>
+ </Filter>
+ <Filter
+ Name="screen"
+ >
<File
- RelativePath=".\src\win32\uce_dirent.h"
+
RelativePath=".\src\screen\game_delta.hpp"
>
</File>
+ <File
+
RelativePath=".\src\screen\gui_screen.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath=".\src\screen\gui_screen.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\screen\input_debug_screen.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\screen\screen.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\screen\screen.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\screen\screen_manager.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath=".\src\screen\screen_manager.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\screen\screen_manager_impl.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\screen\screen_ptr.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath=".\src\screen\screen_ptr.hpp"
+ >
+ </File>
</Filter>
</Filter>
</Files>
Modified: trunk/pingus/src/addon_menu.cpp
===================================================================
--- trunk/pingus/src/addon_menu.cpp 2007-10-25 03:14:42 UTC (rev 3323)
+++ trunk/pingus/src/addon_menu.cpp 2007-10-25 03:19:42 UTC (rev 3324)
@@ -46,7 +46,7 @@
AddOnMenu::draw_background(DrawingContext& gc)
{
// gc.draw_fillrect(Rect(100, 100, 400, 400), Color(255, 0, 0));
- gc.draw(background, gc.get_width()/2 - background.get_width()/2,
gc.get_height()/2 - background.get_height()/2);
+ gc.draw(background, Vector2i(gc.get_width()/2 - background.get_width()/2,
gc.get_height()/2 - background.get_height()/2));
gc.print_center(Fonts::chalk_large, gc.get_width()/2, 90, "Add-On Menu");
@@ -57,7 +57,7 @@
gc.print_center(Fonts::chalk_normal, gc.get_width()/2, gc.get_height()/2 +
160, "Update Online [ ]");
gc.print_center(Fonts::chalk_normal, gc.get_width()/2 + 225 + 30,
gc.get_height()/2 + 125 - 20, _("Close"));
- gc.draw(ok_button, gc.get_width()/2 + 225, gc.get_height()/2 + 125);
+ gc.draw(ok_button, Vector2i(gc.get_width()/2 + 225, gc.get_height()/2 +
125));
gc.draw(ok_button, 610, 145);
}
Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2007-10-25 03:14:42 UTC (rev
3323)
+++ trunk/pingus/src/components/menu_button.cpp 2007-10-25 03:19:42 UTC (rev
3324)
@@ -78,7 +78,7 @@
{
if (mouse_over) // pressed
{
- gc.draw(surface_p,Vector3f(x_pos, y_pos));
+ gc.draw(surface_p,Vector2i(x_pos, y_pos));
gc.print_center(font_large, x_pos, y_pos - 28, text);
// poor mans bold formating
gc.print_center(font_large, x_pos-1, y_pos - 28 - 1, text);
Modified: trunk/pingus/src/level_menu.cpp
===================================================================
--- trunk/pingus/src/level_menu.cpp 2007-10-25 03:14:42 UTC (rev 3323)
+++ trunk/pingus/src/level_menu.cpp 2007-10-25 03:19:42 UTC (rev 3324)
@@ -69,7 +69,7 @@
LevelMenu::draw_background(DrawingContext& gc)
{
// gc.draw_fillrect(Rect(100, 100, 400, 400), Color(255, 0, 0));
- gc.draw(background, gc.get_width()/2 - background.get_width()/2,
gc.get_height()/2 - background.get_height()/2);
+ gc.draw(background, Vector2i(gc.get_width()/2 - background.get_width()/2,
gc.get_height()/2 - background.get_height()/2));
gc.print_center(Fonts::chalk_large, gc.get_width()/2, 90, "Contrib Level
Menu");
Modified: trunk/pingus/src/option_menu.cpp
===================================================================
--- trunk/pingus/src/option_menu.cpp 2007-10-25 03:14:42 UTC (rev 3323)
+++ trunk/pingus/src/option_menu.cpp 2007-10-25 03:19:42 UTC (rev 3324)
@@ -55,7 +55,7 @@
OptionMenu::draw_background(DrawingContext& gc)
{
// gc.draw_fillrect(Rect(100, 100, 400, 400), Color(255, 0, 0));
- gc.draw(background, gc.get_width()/2 - background.get_width()/2,
gc.get_height()/2 - background.get_height()/2);
+ gc.draw(background, Vector2i(gc.get_width()/2 - background.get_width()/2,
gc.get_height()/2 - background.get_height()/2));
gc.print_center(Fonts::chalk_large, gc.get_width()/2, 90, "Option Menu");
@@ -92,7 +92,7 @@
gc.print_center(Fonts::chalk_normal, gc.get_width()/2 + 225 + 30,
gc.get_height()/2 + 125 - 20, _("Close"));
- gc.draw(ok_button, gc.get_width()/2 + 225, gc.get_height()/2 + 125);
+ gc.draw(ok_button, Vector2i(gc.get_width()/2 + 225, gc.get_height()/2 +
125));
gc.print_center(Fonts::chalk_normal, gc.get_width()/2, gc.get_height()/2 +
160, "Reset to Defaults [ ]");
gc.print_left(Fonts::chalk_normal, gc.get_width()/2 - 280, gc.get_height()/2
+ 160, "Save [ ]");
Modified: trunk/pingus/src/win32/pingus.rc
===================================================================
--- trunk/pingus/src/win32/pingus.rc 2007-10-25 03:14:42 UTC (rev 3323)
+++ trunk/pingus/src/win32/pingus.rc 2007-10-25 03:19:42 UTC (rev 3324)
@@ -1,123 +1 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,0,1
- PRODUCTVERSION 0,5,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x23L
-#else
- FILEFLAGS 0x22L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "0c0a04b0"
- BEGIN
- VALUE "FileDescription", "Pingus - A Free Lemmings(TM) Clone"
- VALUE "FileVersion", "0, 5, 0, 1"
- VALUE "InternalName", "pingus.exe"
- VALUE "LegalCopyright", "Copyright � Ingo Ruhnke, 1999"
- VALUE "OriginalFilename", "pingus.exe"
- VALUE "ProductName", "Pingus - A Free Lemmings(TM) Clone"
- VALUE "ProductVersion", "0, 5, 0, 1"
- VALUE "SpecialBuild", "Pre-2"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0xc0a, 1200
- END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-ID_PINGUS ICON "icon1.ico"
-#endif // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Spanish resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
-#ifdef _WIN32
-LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // Spanish resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
+ICN_INSTALL ICON "icon1.ico"
Deleted: trunk/pingus/src/win32/resource.h
===================================================================
--- trunk/pingus/src/win32/resource.h 2007-10-25 03:14:42 UTC (rev 3323)
+++ trunk/pingus/src/win32/resource.h 2007-10-25 03:19:42 UTC (rev 3324)
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by pingus.rc
-//
-#define ID_PINGUS 102
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 103
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3324 - in trunk/pingus: . src src/components src/win32,
jsalmon3 <=