r99 - in trunk: . src src/objects

[DONOTREPLY at icculus.org]

Author: jonas
Date: 2005-03-14 10:51:04 -0500 (Mon, 14 Mar 2005)
New Revision: 99

Modified:
   trunk/TODO
   trunk/lost_penguins.conf
   trunk/src/Makefile
   trunk/src/menu.h
   trunk/src/objects/Makefile
Log:
added optimazation gcc parameters, default bpp set to 16, small doc changes

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2005-03-14 15:49:56 UTC (rev 98)
+++ trunk/TODO	2005-03-14 15:51:04 UTC (rev 99)
@@ -8,6 +8,7 @@
 ====
 
  o General:
+     o (BIG) move drawing to the objects/menus/etc (create a draw() function)!
      o pointers => references where possible
      o Describe everything using Doxygen styles, move the documentation from
       *.cpp to the headers...
@@ -25,6 +26,10 @@
        character down or better: an elevator should push the characters up
      o In case of the elevator, the players are somehow "bound" to the elevator (ie.
        it's not like: the elevator moves, the character falls, but they move together)
+       Solution: The elevators move function checks all objects it would
+         hit, if they are pushable (not dense) they are moved first if
+         possible. If it's not possible, do sthg else (stop the elevator and hit the
+         object/whatever)...
      o the collision detection and the move/fall code is all a big mess
 
  o Animations/Events:

Modified: trunk/lost_penguins.conf
===================================================================
--- trunk/lost_penguins.conf	2005-03-14 15:49:56 UTC (rev 98)
+++ trunk/lost_penguins.conf	2005-03-14 15:51:04 UTC (rev 99)
@@ -4,4 +4,4 @@
 full 0
 width 1024
 height 768
-bpp 32
\ No newline at end of file
+bpp 16

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2005-03-14 15:49:56 UTC (rev 98)
+++ trunk/src/Makefile	2005-03-14 15:51:04 UTC (rev 99)
@@ -14,7 +14,7 @@
 BIN   = ../lost_penguins
 
 
-all:
+default:
 	+$(MAKE) depend
 	+$(MAKE) -C objects
 	+$(MAKE) $(BIN)
@@ -23,7 +23,7 @@
 	$(CXX) $(OBJS) $(PLUGS) $(SDL_LINK) -o $(BIN)
 
 %.o: %.cpp
-	$(CXX) $(CXX_FLAGS) $(CXX_DEBUG) $(CXX_GAME) $(SDL) -c $< -o $@
+	$(CXX) $(CXX_FLAGS) $(CXX_DEBUG) $(CXX_GAME) $(CXX_OPT) $(SDL) -c $< -o $@
 
 $(PLUGS):
 	+$(MAKE) -C objects

Modified: trunk/src/menu.h
===================================================================
--- trunk/src/menu.h	2005-03-14 15:49:56 UTC (rev 98)
+++ trunk/src/menu.h	2005-03-14 15:51:04 UTC (rev 99)
@@ -7,8 +7,6 @@
     virtual function act(), overload it in the child classes. Only the base class
     is needed to draw the menu in gfxeng. The background depends from where the
     menu is called.
-
-    \todo Create the actual menus (StartMenu, etc)...
 */
 class Menu {
     friend class GraphicsEngine;

Modified: trunk/src/objects/Makefile
===================================================================
--- trunk/src/objects/Makefile	2005-03-14 15:49:56 UTC (rev 98)
+++ trunk/src/objects/Makefile	2005-03-14 15:51:04 UTC (rev 99)
@@ -13,13 +13,13 @@
 PLUGS = ../objects.a
 
 
-all:
+default:
 	+$(MAKE) depend
 	+$(MAKE) $(OBJS)
 	+$(MAKE) $(PLUGS)
 
 %.o: %.cpp
-	$(CXX) $(CXX_FLAGS) $(CXX_DEBUG) $(CXX_GAME) $(SDL) -c $< -o $@
+	$(CXX) $(CXX_FLAGS) $(CXX_DEBUG) $(CXX_GAME) $(CXX_OPT) $(SDL) -c $< -o $@
 
 $(PLUGS): $(OBJS)
 	$(AR) r $(PLUGS) $(OBJS)