[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2473 - in trunk: . src src/gui src/win32 src/worldobjs
|
From: |
David Philippi at BerliOS |
|
Subject: |
[Pingus-CVS] r2473 - in trunk: . src src/gui src/win32 src/worldobjs |
|
Date: |
Tue, 1 Nov 2005 23:25:30 +0100 |
Author: torangan
Date: 2005-11-01 23:25:28 +0100 (Tue, 01 Nov 2005)
New Revision: 2473
Removed:
trunk/install-sh
trunk/mkinstalldirs
Modified:
trunk/INSTALL.Win32
trunk/NEWS
trunk/TODO
trunk/src/col_map.cxx
trunk/src/gui/gui_manager.cxx
trunk/src/savegame_manager.cxx
trunk/src/tinygettext.cxx
trunk/src/win32/config.h
trunk/src/win32/pingus.rc
trunk/src/worldobjs/exit.cxx
Log:
patch to allow compile with MSVC
Modified: trunk/INSTALL.Win32
===================================================================
--- trunk/INSTALL.Win32 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/INSTALL.Win32 2005-11-01 22:25:28 UTC (rev 2473)
@@ -9,7 +9,7 @@
The following instructions are only tested with Microsoft Visual Studio 6
and Visual Studio .NET 2003.
- To be able to compile pingus you need a working version of ClanLib 0.7.8
+ To be able to compile pingus you need a working version of ClanLib 0.8.0
or later which is correct installed. You should have both debug and release
builds of the libraries.
@@ -25,15 +25,14 @@
-> ClanLib
(Download at http://www.clanlib.org/download/)
- -> libxml2
-> iconv
- (Download at
http://www.fh-frankfurt.de/~igor/projects/libxml/index.html)
+ (Download at http://gettext.sourceforge.net/)
- To compile ClanLib by yourself you will need several other libraries:
+ To compile ClanLib by yourself you will need several other libraries
+ (all of which are provided at the ClanLib website):
-> DirectX 8/8.1 SDK
(Download at
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.asp)
-
-> ZLib
-> LibJPEG
-> LibPNG
@@ -43,15 +42,9 @@
-> ClanLib itself
(Download at http://www.clanlib.org/)
- To make it easy, ClanLib provides all these external libs (dx8, xml, iconv,
- zlib, jpeg, png, mikmod, vorbis) available in their External Libs package.
- (Download at
http://www.clanlib.org/~sphair/download/external/ExternalLibs.zip)
-
- If you download this package, you only need to download ClanLib and
nothing more
- to compile both ClanLib and Pingus.
-
- The sources of ClanLib can also be found in the CVS tree
- (see Pingus website for more information).
+ To make it easy, ClanLib provides all these external libs available in
+ their External Libs packages.
+ (Download at http://www.clanlib.org/download.html)
_________________________________________________________________
@@ -116,7 +109,7 @@
4. Run Pingus
- Pingus needs some DLLs, namely iconv.dll, intl.dll and libxml2.dll. Copy
+ Pingus needs some DLLs, namely iconv.dll and SDL.dll. Copy
these into the Pingus main dir. They are included in the External Libs
package from clanlib.org.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/NEWS 2005-11-01 22:25:28 UTC (rev 2473)
@@ -1,6 +1,6 @@
0.7.0
=====
-* ClanLib 0.7 support
+* ClanLib 0.8 support
* two new islands
* basic multiplayer support
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/TODO 2005-11-01 22:25:28 UTC (rev 2473)
@@ -3,9 +3,8 @@
* split screen multiplayer
* two new worlds
-*
-Resource String Cleanup:
+Resource String Cleanup (DONE):
========================
Old:
<surface><resource type="datafile">
Deleted: trunk/install-sh
===================================================================
--- trunk/install-sh 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/install-sh 2005-11-01 22:25:28 UTC (rev 2473)
@@ -1,294 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-#
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd=$cpprog
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-if [ x"$src" = x ]
-then
- echo "$0: no input file specified" >&2
- exit 1
-else
- :
-fi
-
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d "$dst" ]; then
- instcmd=:
- chmodcmd=""
- else
- instcmd=$mkdirprog
- fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
- if [ -f "$src" ] || [ -d "$src" ]
- then
- :
- else
- echo "$0: $src does not exist" >&2
- exit 1
- fi
-
- if [ x"$dst" = x ]
- then
- echo "$0: no destination specified" >&2
- exit 1
- else
- :
- fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
- if [ -d "$dst" ]
- then
- dst=$dst/`basename "$src"`
- else
- :
- fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
- '
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@address@hidden' -e 'address@hidden@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
- pathcomp=$pathcomp$1
- shift
-
- if [ ! -d "$pathcomp" ] ;
- then
- $mkdirprog "$pathcomp"
- else
- :
- fi
-
- pathcomp=$pathcomp/
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd "$dst" &&
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename "$dst"`
- else
- dstfile=`basename "$dst" $transformbasename |
- sed $transformarg`$transformbasename
- fi
-
-# don't allow the sed command to completely eliminate the filename
-
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename "$dst"`
- else
- :
- fi
-
-# Make a couple of temp file names in the proper directory.
-
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
-
-# Trap to clean up temp files at exit.
-
- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
- trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
- $doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location. We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons. In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
- if [ -f "$dstdir/$dstfile" ]
- then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
- {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
- }
- else
- :
- fi
-} &&
-
-# Now rename the file to the real destination.
-
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-
-{
- (exit 0); exit
-}
Deleted: trunk/mkinstalldirs
===================================================================
--- trunk/mkinstalldirs 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/mkinstalldirs 2005-11-01 22:25:28 UTC (rev 2473)
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <address@hidden>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage" 1>&2
- exit 0
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-case $dirmode in
- '')
- if mkdir -p -- . 2>/dev/null; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- fi
- ;;
-esac
-
-for file
-do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=""
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
Modified: trunk/src/col_map.cxx
===================================================================
--- trunk/src/col_map.cxx 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/src/col_map.cxx 2005-11-01 22:25:28 UTC (rev 2473)
@@ -79,64 +79,38 @@
void
ColMap::remove(CL_PixelBuffer provider, int x, int y)
{
- ++serial;
+ ++serial;
- if (provider.get_format().get_depth() == 32)
- {
- unsigned char* buffer;
- int swidth = provider.get_width();
- int sheight = provider.get_height();
- int y_offset = -y;
- int x_offset = -x;
- if (y_offset < 0) y_offset = 0;
- if (x_offset < 0) x_offset = 0;
+ int swidth = provider.get_width();
+ int sheight = provider.get_height();
+ int y_offset = -y;
+ int x_offset = -x;
+ if (y_offset < 0) y_offset = 0;
+ if (x_offset < 0) x_offset = 0;
+
+ // The CL_PixelBuffer may have been converted from a CL_Sprite, so it
+ // will have extra space around it, and the width & height are probably
+ // not the correct size of the image. Blank pixels have the value of
+ // 205 for every attribute, so check for that. This seems to only be
+ // a problem with MSVC. GCC works without this check.
+ CL_Color blank_pixel(205, 205, 205, 205);
- provider.lock();
- buffer = static_cast<unsigned char*>(provider.get_data());
+ provider.lock();
- for(int line = y_offset; line < sheight && (line + y) < height; ++line)
+ for(int line = y_offset; line < sheight && (line + y) < height; ++line)
{
- for (int i = x_offset; i < swidth && (i+x) < width; ++i)
- {
- if (buffer[(i + (swidth*line)) * 4] != 0)
+ for (int i = x_offset; i < swidth && (i+x) < width; ++i)
{
- if (colmap[i + (width*(line+y) + x)] != Groundtype::GP_SOLID)
- colmap[i + (width*(line+y) + x)] = Groundtype::GP_NOTHING;
+ if (provider.get_pixel(i, line) != blank_pixel
+ && provider.get_pixel(i, line).get_alpha() != 0)
+ {
+ if (colmap[i + (width*(line+y) + x)] !=
Groundtype::GP_SOLID)
+ colmap[i + (width*(line+y) + x)] =
Groundtype::GP_NOTHING;
+ }
}
- }
}
- provider.unlock();
- }
- else if (provider.get_format().get_depth() == 8)
- {
- unsigned char* buffer;
- int swidth = provider.get_width();
- int sheight = provider.get_height();
- int y_offset = -y;
- int x_offset = -x;
- if (y_offset < 0) y_offset = 0;
- if (x_offset < 0) x_offset = 0;
- provider.lock();
- buffer = static_cast<unsigned char*>(provider.get_data());
-
- for(int line = y_offset; line < sheight && (line + y) < height; ++line)
- {
- for (int i = x_offset; i < swidth && (i+x) < width; ++i)
- {
- if (buffer[i + (swidth*line)])
- {
- if (colmap[i + (width*(line+y) + x)] != Groundtype::GP_SOLID)
- colmap[i + (width*(line+y) + x)] = Groundtype::GP_NOTHING;
- }
- }
- }
- provider.unlock();
- }
- else
- {
- assert(!"ColMap::remove: Color depth not supported");
- }
+ provider.unlock();
}
void
Modified: trunk/src/gui/gui_manager.cxx
===================================================================
--- trunk/src/gui/gui_manager.cxx 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/src/gui/gui_manager.cxx 2005-11-01 22:25:28 UTC (rev 2473)
@@ -17,11 +17,11 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <algorithm>
#include "../debug.hxx"
#include "../globals.hxx"
#include "../input/event.hxx"
#include "game_delta.hxx"
-
#include "gui_manager.hxx"
namespace Pingus {
Modified: trunk/src/savegame_manager.cxx
===================================================================
--- trunk/src/savegame_manager.cxx 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/src/savegame_manager.cxx 2005-11-01 22:25:28 UTC (rev 2473)
@@ -63,13 +63,13 @@
i != sections.end(); ++i)
{
Savegame* savegame = new Savegame(*i);
- SavegameTable::iterator i = savegames.find(savegame->levelname);
+ SavegameTable::iterator j = savegames.find(savegame->levelname);
- if (i != savegames.end())
+ if (j != savegames.end())
{
std::cout << "SavegameManager: name collision: " <<
savegame->levelname << std::endl;
- delete i->second;
- i->second = savegame;
+ delete j->second;
+ j->second = savegame;
}
else
{
Modified: trunk/src/tinygettext.cxx
===================================================================
--- trunk/src/tinygettext.cxx 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/src/tinygettext.cxx 2005-11-01 22:25:28 UTC (rev 2473)
@@ -17,9 +17,14 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#else
+#include "win32/uce_dirent.h"
+#endif
+
#include <sys/types.h>
#include <iconv.h>
-#include <dirent.h>
#include <fstream>
#include <iostream>
#include <ctype.h>
@@ -87,7 +92,7 @@
size_t in_size = text.size();
size_t out_size = 4*in_size; // Worst case scenario: ASCII ->
UTF-32?
std::string result(out_size, ' ');
- ICONV_CONST char* in_str = &text[0];
+ ICONV_CONST char* in_str = &text[0];
char* out_str = &result[0];
// Try to convert the text.
Modified: trunk/src/win32/config.h
===================================================================
--- trunk/src/win32/config.h 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/src/win32/config.h 2005-11-01 22:25:28 UTC (rev 2473)
@@ -11,7 +11,6 @@
#define PATCH_VERSION 0
#define VERSION_STRING "0.7.0"
#define PINGUS_DATADIR "data"
-#define LIBXML_2 1
#define ENABLE_NLS 1
/* 'real' config values */
@@ -23,6 +22,9 @@
#define HAVE_SETLOCALE 1
#define HAVE_STRDUP 1
#define HAVE_GETTEXT 1
+#define HAVE_LIBCLANVORBIS 1
+#define HAVE_LIBCLANMIKMOD 1
+#define ICONV_CONST const
/* MSVC specifics */
#if defined(_MSC_VER) && !defined(__cplusplus)
Modified: trunk/src/win32/pingus.rc
===================================================================
--- trunk/src/win32/pingus.rc 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/src/win32/pingus.rc 2005-11-01 22:25:28 UTC (rev 2473)
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
@@ -13,43 +13,16 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Spanish (Modern) resources
+// Neutral resources
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
#ifdef _WIN32
-LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
-#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
// Version
//
@@ -70,18 +43,14 @@
BEGIN
BLOCK "0c0a04b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "\0"
- VALUE "FileDescription", "Pingus - A Free Lemmings(TM) Clone\0"
- VALUE "FileVersion", "0, 5, 0, 1\0"
- VALUE "InternalName", "pingus.exe\0"
- VALUE "LegalCopyright", "Copyright � Ingo Ruhnke, 1999\0"
- VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "pingus.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Pingus - A Free Lemmings(TM) Clone\0"
- VALUE "ProductVersion", "0, 5, 0, 1\0"
- VALUE "SpecialBuild", "Pre-2\0"
+ 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"
@@ -90,9 +59,7 @@
END
END
-#endif // !_MAC
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -100,12 +67,50 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-ID_PINGUS ICON DISCARDABLE "icon1.ico"
-#endif // Spanish (Modern) resources
+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
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/src/worldobjs/exit.cxx
===================================================================
--- trunk/src/worldobjs/exit.cxx 2005-11-01 12:37:10 UTC (rev 2472)
+++ trunk/src/worldobjs/exit.cxx 2005-11-01 22:25:28 UTC (rev 2473)
@@ -47,14 +47,6 @@
if (verbose > 2)
std::cout << "Creating Exit" << std::endl;
-
-#if 0
- if (use_old_pos_handling) {
- pos.x += sprite.get_width() / 2;
- pos.y += sprite.get_height();
- use_old_pos_handling = false;
- }
-#endif
}
Exit::~Exit ()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2473 - in trunk: . src src/gui src/win32 src/worldobjs,
David Philippi at BerliOS <=