[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src Makefile.static,1.15,1.16 global_even
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src Makefile.static,1.15,1.16 global_event.cxx,1.7,1.8 pingus_main.cxx,1.60,1.61 pingus_menu.cxx,1.15,1.16 |
Date: |
1 Apr 2003 13:21:22 -0000 |
Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv32123/src
Modified Files:
Makefile.static global_event.cxx pingus_main.cxx
pingus_menu.cxx
Log Message:
finished worldmap GUI
Index: Makefile.static
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.static,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.static 16 Mar 2003 23:07:02 -0000 1.15
+++ Makefile.static 1 Apr 2003 13:21:20 -0000 1.16
@@ -1,3 +1,5 @@
+# Compile with CL_HAS_KEY_GRAVE!
+
LDADD = backgrounds/libpingus_backgrounds.a \
colliders/libpingus_colliders.a \
editor/libpingus_editor.a \
Index: global_event.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/global_event.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- global_event.cxx 23 Aug 2002 15:49:48 -0000 1.7
+++ global_event.cxx 1 Apr 2003 13:21:20 -0000 1.8
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <config.h>
#include <stdio.h>
#include <algorithm>
#include <ClanLib/Display/Input/input.h>
@@ -29,9 +30,6 @@
GlobalEvent global_event;
-// FIXME: This belongs into ClanLib
-#define PINGUS_CL_KEY_HELP 91
-
GlobalEvent::GlobalEvent ()
{
}
@@ -66,7 +64,11 @@
// console.scroll_down();
break;
- case PINGUS_CL_KEY_HELP:
+#ifdef CL_HAS_KEY_GRAVE
+ case CL_KEY_GRAVE:
+#else
+ case CL_KEY_NONE_OF_THE_ABOVE:
+#endif
console.toggle_display();
break;
Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- pingus_main.cxx 31 Mar 2003 21:52:03 -0000 1.60
+++ pingus_main.cxx 1 Apr 2003 13:21:20 -0000 1.61
@@ -339,6 +339,9 @@
break;
case 'V':
std::cout << "Pingus Version " << VERSION
+#ifndef OFFICIAL_PINGUS_BUILD
+ << " (unofficial build)"
+#endif
<< std::endl;
std::cout << _("\n\
@@ -654,7 +657,11 @@
void
PingusMain::print_greeting_message()
{
- std::string greeting = "Welcome to Pingus "VERSION"!";
+ std::string greeting = "Welcome to Pingus "VERSION;
+#ifndef OFFICIAL_PINGUS_BUILD
+ greeting += " (unofficial build)";
+#endif
+ greeting += "!";
std::cout << greeting << std::endl;
for (unsigned int i = 0; i < greeting.length(); ++i)
std::cout.put('=');
Index: pingus_menu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pingus_menu.cxx 27 Mar 2003 17:04:49 -0000 1.15
+++ pingus_menu.cxx 1 Apr 2003 13:21:20 -0000 1.16
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <config.h>
#include "menu_button.hxx"
#include "pingus_resource.hxx"
#include "debug.hxx"
@@ -72,8 +73,13 @@
PingusMenu::draw_foreground(GraphicContext& gc)
{
gc.draw(background, (gc.get_width()/2) - (background.get_width()/2), 50);
+#ifdef OFFICIAL_PINGUS_BUILD
gc.print_left(Fonts::pingus_small, 20, 500,
- "Pingus version 0.6.0, Copyright (C) 1998 Ingo Ruhnke
<address@hidden>\n");
+ "Pingus version "VERSION", Copyright (C) 1998 Ingo Ruhnke
<address@hidden>\n");
+#else
+ gc.print_left(Fonts::pingus_small, 20, 500,
+ "Pingus version "VERSION" (unofficial build), Copyright (C)
1998 Ingo Ruhnke <address@hidden>\n");
+#endif
gc.print_left(Fonts::pingus_small, 20, 530,
"Pingus comes with ABSOLUTELY NO WARRANTY. This is free
software, and you are welcome\n"
"to redistribute it under certain conditions; see the file
COPYING for details.\n");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src Makefile.static,1.15,1.16 global_event.cxx,1.7,1.8 pingus_main.cxx,1.60,1.61 pingus_menu.cxx,1.15,1.16,
grumbel <=