super-tux-commit — Messages about commits to the sourcecode.

[Super-tux-commit] supertux/data/images/tilesets supertux.stgt,1.24,1.25

[Tobias Gl??er <to...@us...>]

Update of /cvsroot/super-tux/supertux/data/images/tilesets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12207

Modified Files:
	supertux.stgt 
Log Message:


Index: supertux.stgt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- supertux.stgt	3 May 2004 20:35:25 -0000	1.24
+++ supertux.stgt	4 May 2004 22:34:34 -0000	1.25
@@ -10,7 +10,7 @@
  (tilegroup (name "Background") (tiles 24 25 63 70 71 72 73 74 106 107 108 109 110 111))
  (tilegroup (name "Classic-Bg") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101))
  (tilegroup (name "Points") (tiles 132 133))
- (tilegroup (name "Bonus") (tiles 26 44 45 46 82 83 84 102 103 104 105 112 128))
+ (tilegroup (name "Bonus") (tiles 44 83 84 102 103 104 105 112 128))
  (tilegroup (name "Goodies") (tiles 126 127 136 137 138 139))
  (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60))
  (tile (id 0)

Re: [Super-tux-commit] supertux TODO,1.34,1.35

[Ricardo C. <ri...@ae...>]

 Marek, read my lips; that code is still in development! What matters is th=
at=20
the ordinary scrolling works fine, right?

Ricardo

Em Ter=E7a, 4 de Maio de 2004 22:54, o Matze Braun escreveu:
> Update of /cvsroot/super-tux/supertux
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3841
>
> Modified Files:
> 	TODO
> Log Message:
> scrolling is broken
>
> Index: TODO
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/super-tux/supertux/TODO,v
> retrieving revision 1.34
> retrieving revision 1.35
> diff -u -d -r1.34 -r1.35
> --- TODO	4 May 2004 19:13:42 -0000	1.34
> +++ TODO	4 May 2004 21:54:42 -0000	1.35
> @@ -11,6 +11,9 @@
>  H: high priority
>  L: low priority
>
> +[H] Scrolling is broken, if you fastly reverse around the middle of the
> screen +    the scrolling has sudden hickups. Also the scrollstart positi=
on
> still isn't +    the same as before the changes.
>  [H] Frame ratio code has been changed and so the animation may need
> tuning. Somebody do some testing and change the definitions regarding thi=
s.
> [M] When aborting a level, lives and score should remain the same as they
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by: Oracle 10g
> Get certified on the hottest thing ever to hit the market... Oracle 10g.
> Take an Oracle 10g class now, and we'll give you the exam FREE.
> http://ads.osdn.com/?ad_id=3D3149&alloc_id=3D8166&op=3Dclick
> _______________________________________________
> Super-tux-commit mailing list
> Sup...@li...
> https://lists.sourceforge.net/lists/listinfo/super-tux-commit

=2D-=20
To err is human,
To purr feline.
		-- Robert Byrne

[Super-tux-commit] supertux/src button.cpp,1.21,1.22 button.h,1.17,1.18 leveleditor.cpp,1.80,1.81 menu.h,1.57,1.58

[Tobias Gl??er <to...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8583/src

Modified Files:
	button.cpp button.h leveleditor.cpp menu.h 
Log Message:
LevelEditor bug-fixes, improvements and fine-tuning. 

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- button.cpp	3 May 2004 23:06:19 -0000	1.21
+++ button.cpp	4 May 2004 22:16:11 -0000	1.22
@@ -31,26 +31,7 @@
 {
   popup_timer.init(false);
 
-  char filename[1024];
-
-  if(!icon_file.empty())
-  {
-    snprintf(filename, 1024, "%s/%s", datadir.c_str(), icon_file.c_str());
-    if(!faccessible(filename))
-      snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
-  }
-  else
-  {
-    snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
-  }
-
-  if(mw != -1 || mh != -1)
-  {
-    icon = new Surface(filename,USE_ALPHA);
-    icon->resize(mw,mh);
-  }
-  else
-    icon = new Surface(filename,USE_ALPHA);
+  add_icon(icon_file,mw,mh);
 
   info = ninfo;
 
@@ -58,16 +39,15 @@
 
   rect.x = x;
   rect.y = y;
-  rect.w = icon->w;
-  rect.h = icon->h;
+  rect.w = icon[0]->w;
+  rect.h = icon[0]->h;
   tag = -1;
   state = BUTTON_NONE;
   show_info = false;
-  bkgd = NULL;
   game_object = NULL;
 }
 
-void Button::change_icon(std::string icon_file, int /*mw*/, int /*mh*/)
+void Button::add_icon(std::string icon_file, int mw, int mh)
 {
   char filename[1024];
 
@@ -82,8 +62,14 @@
     snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
   }
 
-  delete icon;
-  icon = new Surface(filename,USE_ALPHA);
+  if(mw != -1 || mh != -1)
+  {
+    icon.push_back(new Surface(filename,USE_ALPHA));
+    icon.back()->resize(mw,mh);
+  }
+  else
+    icon.push_back(new Surface(filename,USE_ALPHA));
+    
 }
 
 void Button::draw()
@@ -94,11 +80,10 @@
 
   fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200);
   fillrect(rect.x+1,rect.y+1,rect.w-2,rect.h-2,175,175,175,200);
-  if(bkgd != NULL)
-  {
-    bkgd->draw(rect.x,rect.y);
-  }
-  icon->draw(rect.x,rect.y);
+
+  for(std::vector<Surface*>::iterator it = icon.begin(); it != icon.end(); ++it)
+  (*it)->draw(rect.x,rect.y);
+  
   if(game_object != NULL)
   {
     game_object->draw_on_screen();
@@ -125,7 +110,9 @@
 
 Button::~Button()
 {
-  delete icon;
+  for(std::vector<Surface*>::iterator it = icon.begin(); it != icon.end(); ++it)
+  delete (*it);
+  icon.clear();
   delete game_object;
 }
 

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- menu.h	3 May 2004 23:06:19 -0000	1.57
+++ menu.h	4 May 2004 22:16:11 -0000	1.58
@@ -64,9 +64,9 @@
   };
   
 enum LevelEditorSubsetSettingsIDs {
-  MNID_TITLE,
-  MNID_DESCRIPTION,
-  MNID_SAVE_CHANGES
+  MNID_SUBSETTITLE,
+  MNID_SUBSETDESCRIPTION,
+  MNID_SUBSETSAVECHANGES
   };
   
 enum LevelEditorSubsetNewIDs {

Index: button.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- button.h	2 May 2004 22:26:04 -0000	1.17
+++ button.h	4 May 2004 22:16:11 -0000	1.18
@@ -43,7 +43,7 @@
   void event(SDL_Event& event);
   void draw();
   int get_state();
-  void change_icon(std::string icon_file, int mw, int mh);
+  void add_icon(std::string icon_file, int mw, int mh);
   SDL_Rect get_pos() { return rect; }
   int get_tag(){return tag; }
   void set_game_object(GameObject* game_object_) { game_object = game_object_; }
@@ -52,8 +52,7 @@
 private:
   static Timer popup_timer;
   GameObject* game_object;
-  Surface* icon;
-  Surface* bkgd;
+  std::vector<Surface*> icon;
   std::string info;
   SDLKey shortcut;
   SDL_Rect rect;

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- leveleditor.cpp	3 May 2004 23:06:19 -0000	1.80
+++ leveleditor.cpp	4 May 2004 22:16:11 -0000	1.81
@@ -117,6 +117,7 @@
   bool IsTile() { return is_tile; };
   //Returns true for a GameObject
   bool IsObject() { return !is_tile; };
+  void Init() { tile = 0; obj = NULL; is_tile = true; };
 
   bool is_tile; //true for tile (false for object)
   unsigned int tile;
@@ -375,14 +376,14 @@
       }
       else if(menu == subset_settings_menu)
       {
-        if(le_level_subset->title.compare(subset_settings_menu->get_item_by_id(MNID_TITLE).input) == 0 && le_level_subset->description.compare(subset_settings_menu->get_item_by_id(MNID_DESCRIPTION).input) == 0  )
-          subset_settings_menu->get_item_by_id(MNID_SAVE_CHANGES).kind = MN_DEACTIVE;
+        if(le_level_subset->title.compare(subset_settings_menu->get_item_by_id(MNID_SUBSETTITLE).input) == 0 && le_level_subset->description.compare(subset_settings_menu->get_item_by_id(MNID_SUBSETDESCRIPTION).input) == 0  )
+          subset_settings_menu->get_item_by_id(MNID_SUBSETSAVECHANGES).kind = MN_DEACTIVE;
         else
-          subset_settings_menu->get_item_by_id(MNID_SAVE_CHANGES).kind = MN_ACTION;
+          subset_settings_menu->get_item_by_id(MNID_SUBSETSAVECHANGES).kind = MN_ACTION;
 
         switch (i = subset_settings_menu->check())
         {
-        case MNID_SAVE_CHANGES:
+        case MNID_SUBSETSAVECHANGES:
           save_subset_settings_menu();
           //FIXME:show_menu = true;
           Menu::set_current(leveleditor_menu);
@@ -455,10 +456,10 @@
 
   subset_settings_menu->additem(MN_LABEL,"Level Subset Settings",0,0);
   subset_settings_menu->additem(MN_HL,"",0,0);
-  subset_settings_menu->additem(MN_TEXTFIELD,"Title",0,0);
-  subset_settings_menu->additem(MN_TEXTFIELD,"Description",0,0);
+  subset_settings_menu->additem(MN_TEXTFIELD,"Title",0,0,MNID_SUBSETTITLE);
+  subset_settings_menu->additem(MN_TEXTFIELD,"Description",0,0,MNID_SUBSETDESCRIPTION);
   subset_settings_menu->additem(MN_HL,"",0,0);
-  subset_settings_menu->additem(MN_ACTION,"Save Changes",0,0);
+  subset_settings_menu->additem(MN_ACTION,"Save Changes",0,0,MNID_SUBSETSAVECHANGES);
   subset_settings_menu->additem(MN_HL,"",0,0);
   subset_settings_menu->additem(MN_BACK,"Back",0,0);
 
@@ -500,6 +501,7 @@
         sit != (*it).tiles.end(); ++sit, ++i)
     {
       std::string imagefile = "/images/tilesets/" ;
+      bool only_editor_image = false;
       if(!TileManager::instance()->get(*sit)->filenames.empty())
       {
         imagefile += TileManager::instance()->get(*sit)->filenames[0];
@@ -507,6 +509,7 @@
       else if(!TileManager::instance()->get(*sit)->editor_filenames.empty())
       {
         imagefile += TileManager::instance()->get(*sit)->editor_filenames[0];
+	only_editor_image = true;
       }
       else
       {
@@ -514,6 +517,12 @@
       }
       Button* button = new Button(imagefile, it->name, SDLKey(SDLK_a + i),
                                   0, 0, 32, 32);
+      if(!only_editor_image)
+      if(!TileManager::instance()->get(*sit)->editor_filenames.empty())
+      {
+        imagefile = "/images/tilesets/" + TileManager::instance()->get(*sit)->editor_filenames[0];      
+        button->add_icon(imagefile,32,32);
+      }
       tilegroups_map[it->name]->additem(button, *sit);
     }
   }
@@ -539,14 +548,12 @@
 int le_init()
 {
   level_subsets = dsubdirs("/levels", "info");
-
   le_level_subset = new LevelSubset;
 
   active_tm = TM_IA;
-
   le_show_grid = true;
+  scroll_x = 0;
 
-  /*  level_changed = NO;*/
   fire = DOWN;
   done = 0;
   le_frame = 0;	/* support for frames in some tiles, like waves and bad guys */
@@ -581,7 +588,9 @@
   le_tilemap_panel->additem(new Button("/images/icons/bkgrd.png","Background",SDLK_F4,0,0),TM_BG);
   le_tilemap_panel->additem(new Button("/images/icons/intact.png","Interactive",SDLK_F4,0,0),TM_IA);
   le_tilemap_panel->additem(new Button("/images/icons/frgrd.png","Foreground",SDLK_F4,0,0),TM_FG);
-
+    
+  le_current.Init();
+  
   le_init_menus();
 
   SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
@@ -1398,7 +1407,7 @@
 
   music_manager->halt_music();
 
-  Menu::set_current(leveleditor_menu);
+  Menu::set_current(NULL);
   le_world.arrays_free();
   le_current_level->load_gfx();
   le_world.activate_bad_guys();

[Super-tux-commit] supertux TODO,1.34,1.35

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3841

Modified Files:
	TODO 
Log Message:
scrolling is broken

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- TODO	4 May 2004 19:13:42 -0000	1.34
+++ TODO	4 May 2004 21:54:42 -0000	1.35
@@ -11,6 +11,9 @@
 H: high priority
 L: low priority
 
+[H] Scrolling is broken, if you fastly reverse around the middle of the screen
+    the scrolling has sudden hickups. Also the scrollstart position still isn't
+    the same as before the changes.
 [H] Frame ratio code has been changed and so the animation may need tuning.
     Somebody do some testing and change the definitions regarding this.
 [M] When aborting a level, lives and score should remain the same as they

[Super-tux-commit] supertux/src defines.h,1.30,1.31

[Tobias Gl??er <to...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23868/src

Modified Files:
	defines.h 
Log Message:
corrected typo 

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- defines.h	4 May 2004 19:49:39 -0000	1.30
+++ defines.h	4 May 2004 20:57:01 -0000	1.31
@@ -49,7 +49,7 @@
 };
 
 /* Screen proprities: */
-/* Don't use this to test for the actual screen sizes. Use screen->w/h instead!
+/* Don't use this to test for the actual screen sizes. Use screen->w/h instead! */
 #define SCREEN_W 640
 #define SCREEN_H 480
 

[Super-tux-commit] supertux/src defines.h,1.29,1.30

[Tobias Gl??er <to...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5360/src

Modified Files:
	defines.h 
Log Message:
Added a comment. 

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- defines.h	4 May 2004 11:27:39 -0000	1.29
+++ defines.h	4 May 2004 19:49:39 -0000	1.30
@@ -49,7 +49,7 @@
 };
 
 /* Screen proprities: */
-
+/* Don't use this to test for the actual screen sizes. Use screen->w/h instead!
 #define SCREEN_W 640
 #define SCREEN_H 480
 

[Super-tux-commit] supertux TODO,1.33,1.34

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29690

Modified Files:
	TODO 
Log Message:
Added another point.

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- TODO	4 May 2004 19:12:39 -0000	1.33
+++ TODO	4 May 2004 19:13:42 -0000	1.34
@@ -11,6 +11,8 @@
 H: high priority
 L: low priority
 
+[H] Frame ratio code has been changed and so the animation may need tuning.
+    Somebody do some testing and change the definitions regarding this.
 [M] When aborting a level, lives and score should remain the same as they
     were before. Solution: make more dependency between the game engine and worldmap
     or just backup those variables before starting a level.

[Super-tux-commit] supertux/data/levels/world1 level13.stl,1.10,1.11

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/data/levels/world1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29336/data/levels/world1

Modified Files:
	level13.stl 
Log Message:
Removed scrolling printf, back scrolling from level 13 and snow from menu.
So, two points are gone now.
Notice that the back scrolling is still in development, so please calm down, and don't add it to the TODO as a bug. Besides no level use it. I told Ryan to give a look at that code now.

Index: level13.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- level13.stl	3 May 2004 13:36:19 -0000	1.10
+++ level13.stl	4 May 2004 19:12:39 -0000	1.11
@@ -17,7 +17,7 @@
   (bkgd_blue_bottom   255)
   (time  200)
   (gravity  10.0)
-  (back_scrolling #t)
+  (back_scrolling #f)
   (particle_system "clouds")
   (theme "antarctica")
   (interactive-tm

[Super-tux-commit] supertux/src world.cpp,1.57,1.58

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29336/src

Modified Files:
	world.cpp 
Log Message:
Removed scrolling printf, back scrolling from level 13 and snow from menu.
So, two points are gone now.
Notice that the back scrolling is still in development, so please calm down, and don't add it to the TODO as a bug. Besides no level use it. I told Ryan to give a look at that code now.

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- world.cpp	4 May 2004 15:38:58 -0000	1.57
+++ world.cpp	4 May 2004 19:12:39 -0000	1.58
@@ -330,7 +330,7 @@
       final_scroll_x = tux_pos_x - (screen->w - X_SPACE);
     else// if (tux.dir == LEFT)// && )
       final_scroll_x = tux_pos_x - X_SPACE;
-printf("%f\n", frame_ratio);
+
     scroll_x += ((final_scroll_x - scroll_x) / (CHANGE_DIR_SCROLL_SPEED)) * frame_ratio;
     }
 

[Super-tux-commit] supertux/data/levels/misc menu.stl,1.3,1.4

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/data/levels/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29336/data/levels/misc

Modified Files:
	menu.stl 
Log Message:
Removed scrolling printf, back scrolling from level 13 and snow from menu.
So, two points are gone now.
Notice that the back scrolling is still in development, so please calm down, and don't add it to the TODO as a bug. Besides no level use it. I told Ryan to give a look at that code now.

Index: menu.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/misc/menu.stl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- menu.stl	22 Apr 2004 14:14:51 -0000	1.3
+++ menu.stl	4 May 2004 19:12:38 -0000	1.4
@@ -11,7 +11,6 @@
   (bkgd_blue   255)
   (time  500)
   (gravity  10)
-  (particle_system "snow")
   (theme "antarctica")
   (interactive-tm
    0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  

[Super-tux-commit] supertux TODO,1.32,1.33

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29336

Modified Files:
	TODO 
Log Message:
Removed scrolling printf, back scrolling from level 13 and snow from menu.
So, two points are gone now.
Notice that the back scrolling is still in development, so please calm down, and don't add it to the TODO as a bug. Besides no level use it. I told Ryan to give a look at that code now.

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- TODO	4 May 2004 17:42:56 -0000	1.32
+++ TODO	4 May 2004 19:12:39 -0000	1.33
@@ -11,10 +11,6 @@
 H: high priority
 L: low priority
 
-[H] Scrolling still broken, changing directions while jumping causes
-   the camera to 'jump', level13 even more broken and full of debug prints
-[M] Tux releases bonus in the intro without collecting them, looks
-   stupid, background is most likly drawn twice, intro shouldn't have snow
 [M] When aborting a level, lives and score should remain the same as they
     were before. Solution: make more dependency between the game engine and worldmap
     or just backup those variables before starting a level.

[Super-tux-commit] supertux/src title.cpp,1.76,1.77

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26465/src

Modified Files:
	title.cpp 
Log Message:
The background was being drawn twice, as reported by Ingo.
Ingo, could you replace all powerup boxes with money ones. Thx
And why was the background changed? This one sucks when scrolling (it has a column of pixels on the right that give a bad look).

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- title.cpp	3 May 2004 23:27:31 -0000	1.76
+++ title.cpp	4 May 2004 18:58:51 -0000	1.77
@@ -172,31 +172,6 @@
 
   world->play_music(LEVEL_MUSIC);
   
-  /* FIXME:
-  // update particle systems
-  std::vector<ParticleSystem*>::iterator p;
-  for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
-    {
-      (*p)->simulate(frame_ratio);
-    }
-
-  // Draw particle systems (background)
-  for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
-    {
-      (*p)->draw(scroll_x, 0, 0);
-    }
-  */
-
-  // Draw interactive tiles:
-/*  for (int y = 0; y < 15; ++y)
-    {
-      for (int x = 0; x < 21; ++x)
-        {
-          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
-                     plevel->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
-        }
-    }*/
-
   global_frame_counter++;
   tux->key_event((SDLKey) keymap.right,DOWN);
   
@@ -291,7 +266,6 @@
         }
 
       /* Draw the background: */
-      draw_background();
       draw_demo(&session, frame_ratio);
       
       if (Menu::current() == main_menu)

Re: [Super-tux-commit] supertux TODO,1.31,1.32

[Ricardo C. <ri...@ae...>]

 IMO, stupider than that is to jump into a box and nothing gets out of ther=
e=20
at all. I think we should just replace all boxes with goodies with coins=20
ones.

Ricardo Cruz

Em Ter=E7a, 4 de Maio de 2004 18:42, o Ingo Ruhnke escreveu:
> +[M] Tux releases bonus in the intro without collecting them, looks
> +   stupid, background is most likly drawn twice, intro shouldn't have sn=
ow

=2D-=20
Telephone, n.:
	An invention of the devil which abrogates some of the advantages
	of making a disagreeable person keep his distance.
		-- Ambrose Bierce

[Super-tux-commit] supertux TODO,1.31,1.32

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9961

Modified Files:
	TODO 
Log Message:
more issues


Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- TODO	4 May 2004 17:31:27 -0000	1.31
+++ TODO	4 May 2004 17:42:56 -0000	1.32
@@ -11,7 +11,10 @@
 H: high priority
 L: low priority
 
-[M] Tux releases bonus in the intro without collecting them, looks stupid
+[H] Scrolling still broken, changing directions while jumping causes
+   the camera to 'jump', level13 even more broken and full of debug prints
+[M] Tux releases bonus in the intro without collecting them, looks
+   stupid, background is most likly drawn twice, intro shouldn't have snow
 [M] When aborting a level, lives and score should remain the same as they
     were before. Solution: make more dependency between the game engine and worldmap
     or just backup those variables before starting a level.

[Super-tux-commit] supertux TODO,1.30,1.31

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7728

Modified Files:
	TODO 
Log Message:


Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- TODO	4 May 2004 17:00:01 -0000	1.30
+++ TODO	4 May 2004 17:31:27 -0000	1.31
@@ -11,6 +11,7 @@
 H: high priority
 L: low priority
 
+[M] Tux releases bonus in the intro without collecting them, looks stupid
 [M] When aborting a level, lives and score should remain the same as they
     were before. Solution: make more dependency between the game engine and worldmap
     or just backup those variables before starting a level.

[Super-tux-commit] supertux/data/images/icons rubber.png,1.3,1.4

[Tobias Gl??er <to...@us...>]

Update of /cvsroot/super-tux/supertux/data/images/icons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4414/data/images/icons

Modified Files:
	rubber.png 
Log Message:
update

Index: rubber.png
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/icons/rubber.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsKKD6Fl and /tmp/cvsNupP0g differ

[Super-tux-commit] supertux TODO,1.29,1.30

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1002

Modified Files:
	TODO 
Log Message:
Removed scrolling bug, added an Abort level one.

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- TODO	3 May 2004 20:23:01 -0000	1.29
+++ TODO	4 May 2004 17:00:01 -0000	1.30
@@ -11,9 +11,9 @@
 H: high priority
 L: low priority
 
-[H] Scrolling is broken, should show at leats 3/4 of the screen to
-   Tuxs right, so that the player has a reasonably chance to see
-   enemies early on, currenty one can only not even a half screen ahead
+[M] When aborting a level, lives and score should remain the same as they
+    were before. Solution: make more dependency between the game engine and worldmap
+    or just backup those variables before starting a level.
 [L] change lispreader to throw exceptions instead of simply assert() on
     syntax error
 [L] tux sometimes makes short jumps in the endsequence, mostly when

[Super-tux-commit] supertux/src gameloop.cpp,1.120,1.121

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22874/src

Modified Files:
	gameloop.cpp 
Log Message:
Fixed frame_ratio() workaround.

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- gameloop.cpp	3 May 2004 13:00:35 -0000	1.120
+++ gameloop.cpp	4 May 2004 16:03:48 -0000	1.121
@@ -546,7 +546,6 @@
 
   draw();
 
-  float overlap = 0.0f;
   while (exit_status == NONE)
     {
       /* Calculate the movement-factor */
@@ -569,19 +568,12 @@
       // determistic and not different on different machines
       if(!game_pause && !Menu::current())
         {
-          frame_ratio *= game_speed;
-          frame_ratio += overlap;
-          while (frame_ratio > 0)
-            {
-              // Update the world
-              check_end_conditions();
-              if (end_sequence == ENDSEQUENCE_RUNNING)
-                action(.5f);
-              else if(end_sequence == NO_ENDSEQUENCE)
-                action(1.0f);
-              frame_ratio -= 1.0f;
-            }
-          overlap = frame_ratio;
+          // Update the world
+          check_end_conditions();
+          if (end_sequence == ENDSEQUENCE_RUNNING)
+             action(frame_ratio/2);
+          else if(end_sequence == NO_ENDSEQUENCE)
+             action(frame_ratio);
         }
       else
         {

[Super-tux-commit] supertux/src world.cpp,1.56,1.57 world.h,1.35,1.36

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17807/src

Modified Files:
	world.cpp world.h 
Log Message:
Fixed srolling camera move. Silly me, I forgot about the frame rates.
It still doesn't work, since the frame_ratio variable is not calculated... It has allways the same value. Is this some workaround?
«  action(1.0f);  »

Index: world.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- world.h	4 May 2004 13:59:00 -0000	1.35
+++ world.h	4 May 2004 15:38:58 -0000	1.36
@@ -45,7 +45,6 @@
   Player tux;
 
   Timer scrolling_timer;
-  float moved_scroll_x;
 
   int distro_counter;
   bool counting_distros;
@@ -79,7 +78,7 @@
 
   void draw();
   void action(double frame_ratio);
-  void scrolling();   // camera scrolling
+  void scrolling(double frame_ratio);   // camera scrolling
 
   void play_music(int musictype);
   int get_music_type();

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- world.cpp	4 May 2004 14:41:14 -0000	1.56
+++ world.cpp	4 May 2004 15:38:58 -0000	1.57
@@ -261,7 +261,7 @@
 World::action(double frame_ratio)
 {
   tux.action(frame_ratio);
-  scrolling();
+  scrolling(frame_ratio);
 
   /* Handle bouncy distros: */
   for (unsigned int i = 0; i < bouncy_distros.size(); i++)
@@ -316,7 +316,7 @@
 #define CHANGE_DIR_SCROLL_SPEED 2000
 
 /* This functions takes cares of the scrolling */
-void World::scrolling()
+void World::scrolling(double frame_ratio)
 {
   int tux_pos_x = (int)(tux.base.x + (tux.base.width/2));
 
@@ -330,17 +330,12 @@
       final_scroll_x = tux_pos_x - (screen->w - X_SPACE);
     else// if (tux.dir == LEFT)// && )
       final_scroll_x = tux_pos_x - X_SPACE;
-
-    if(moved_scroll_x == 0)
-      moved_scroll_x = scroll_x;
-
-    scroll_x += (final_scroll_x - scroll_x) / (CHANGE_DIR_SCROLL_SPEED);
+printf("%f\n", frame_ratio);
+    scroll_x += ((final_scroll_x - scroll_x) / (CHANGE_DIR_SCROLL_SPEED)) * frame_ratio;
     }
 
   else
     {
-    moved_scroll_x = 0;
-
     if (tux.dir == RIGHT && scroll_x < tux_pos_x - (screen->w - X_SPACE))
       scroll_x = tux_pos_x - (screen->w - X_SPACE);
     else if (tux.dir == LEFT && scroll_x > tux_pos_x - X_SPACE && (level->back_scrolling || debug_mode))

[Super-tux-commit] supertux/src world.cpp,1.55,1.56

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5197/src

Modified Files:
	world.cpp 
Log Message:
Added a test for a end of level scrolling test...
There seems to be an end sequence issue regarding this, doesn't it make use of the scrolling()?

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- world.cpp	4 May 2004 13:59:00 -0000	1.55
+++ world.cpp	4 May 2004 14:41:14 -0000	1.56
@@ -347,8 +347,11 @@
       scroll_x = tux_pos_x - X_SPACE;
     }
 
+  // this code prevent the screen to scroll before the start or after the level's end
   if(scroll_x < 0)
     scroll_x = 0;
+  if(scroll_x > (level->width-1) * 32)
+    scroll_x = (level->width-1) * 32;
 }
 
 void

[Super-tux-commit] supertux/data/images icon.png,1.4,NONE

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/data/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1897/data/images

Removed Files:
	icon.png 
Log Message:
Moved this image to the old shared dir, in order to prevent it from being included in the next version.

--- icon.png DELETED ---

[Super-tux-commit] supertux/data/images/shared/old icon.png,NONE,1.1

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/data/images/shared/old
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1897/data/images/shared/old

Added Files:
	icon.png 
Log Message:
Moved this image to the old shared dir, in order to prevent it from being included in the next version.

--- NEW FILE: icon.png ---
(This appears to be a binary file; contents omitted.)

[Super-tux-commit] supertux/data/images icon.png,1.3,1.4

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux/data/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28413

Added Files:
	icon.png 
Log Message:
- icon is not useless, the .xpm version is scaled down, the .png has the original size

--- NEW FILE: icon.png ---
(This appears to be a binary file; contents omitted.)

[Super-tux-commit] supertux/src player.cpp,1.82,1.83 player.h,1.50,1.51 world.cpp,1.54,1.55 world.h,1.34,1.35

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27208/src

Modified Files:
	player.cpp player.h world.cpp world.h 
Log Message:
Made it possible for Tux to be in a position before the half of the screen.
Started implementing a moving camera, but it isn't working very well, i'll have a look at it later.

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- player.cpp	3 May 2004 12:34:37 -0000	1.82
+++ player.cpp	4 May 2004 13:58:59 -0000	1.83
@@ -78,6 +78,7 @@
   base.ym = 0;
   previous_base = old_base = base;
   dir = RIGHT;
+  old_dir = dir;
   duck = false;
 
   dying   = DYING_NOT;
@@ -295,9 +296,11 @@
 
   float dirsign = 0;
   if(input.left == DOWN && input.right == UP && (!duck || physic.get_velocity_y() != 0)) {
+      old_dir = dir;
       dir = LEFT;
       dirsign = -1;
   } else if(input.left == UP && input.right == DOWN && (!duck || physic.get_velocity_y() != 0)) {
+      old_dir = dir;
       dir = RIGHT;
       dirsign = 1;
   }

Index: world.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- world.h	3 May 2004 12:34:37 -0000	1.34
+++ world.h	4 May 2004 13:59:00 -0000	1.35
@@ -44,6 +44,9 @@
   Level* level;
   Player tux;
 
+  Timer scrolling_timer;
+  float moved_scroll_x;
+
   int distro_counter;
   bool counting_distros;
   int currentmusic;
@@ -76,7 +79,7 @@
 
   void draw();
   void action(double frame_ratio);
-  void keep_in_bounds();
+  void scrolling();   // camera scrolling
 
   void play_music(int musictype);
   int get_music_type();

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- world.cpp	3 May 2004 23:44:28 -0000	1.54
+++ world.cpp	4 May 2004 13:59:00 -0000	1.55
@@ -54,6 +54,8 @@
   get_level()->load_song();
 
   apply_bonuses();
+
+  scrolling_timer.init(true);
 }
 
 World::World(const std::string& subset, int level_nr)
@@ -73,6 +75,8 @@
   get_level()->load_song();
 
   apply_bonuses();
+
+  scrolling_timer.init(true);
 }
 
 void
@@ -257,7 +261,7 @@
 World::action(double frame_ratio)
 {
   tux.action(frame_ratio);
-  keep_in_bounds();
+  scrolling();
 
   /* Handle bouncy distros: */
   for (unsigned int i = 0; i < bouncy_distros.size(); i++)
@@ -307,17 +311,41 @@
 
 // the space that it takes for the screen to start scrolling, regarding
 // screen bounds (in pixels)
-#define X_SPACE 160
+#define X_SPACE 380
+// the time it takes to move the camera (in ms)
+#define CHANGE_DIR_SCROLL_SPEED 2000
 
 /* This functions takes cares of the scrolling */
-void World::keep_in_bounds()
+void World::scrolling()
 {
   int tux_pos_x = (int)(tux.base.x + (tux.base.width/2));
 
-  if (scroll_x < tux_pos_x - (screen->w - X_SPACE))
-    scroll_x = tux_pos_x - (screen->w - X_SPACE);
-  else if (scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
-    scroll_x = tux_pos_x - X_SPACE;
+  if(tux.old_dir != tux.dir && (level->back_scrolling || debug_mode))
+    scrolling_timer.start(CHANGE_DIR_SCROLL_SPEED);
+    
+  if(scrolling_timer.check())
+    {
+    float final_scroll_x;
+    if (tux.dir == RIGHT)
+      final_scroll_x = tux_pos_x - (screen->w - X_SPACE);
+    else// if (tux.dir == LEFT)// && )
+      final_scroll_x = tux_pos_x - X_SPACE;
+
+    if(moved_scroll_x == 0)
+      moved_scroll_x = scroll_x;
+
+    scroll_x += (final_scroll_x - scroll_x) / (CHANGE_DIR_SCROLL_SPEED);
+    }
+
+  else
+    {
+    moved_scroll_x = 0;
+
+    if (tux.dir == RIGHT && scroll_x < tux_pos_x - (screen->w - X_SPACE))
+      scroll_x = tux_pos_x - (screen->w - X_SPACE);
+    else if (tux.dir == LEFT && scroll_x > tux_pos_x - X_SPACE && (level->back_scrolling || debug_mode))
+      scroll_x = tux_pos_x - X_SPACE;
+    }
 
   if(scroll_x < 0)
     scroll_x = 0;

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- player.h	3 May 2004 12:34:37 -0000	1.50
+++ player.h	4 May 2004 13:59:00 -0000	1.51
@@ -117,6 +117,7 @@
   DyingType dying;
 
   Direction dir;
+  Direction old_dir;
 
   bool jumping;
   bool can_jump;

[Super-tux-commit] supertux/data/images icon.png,1.2,NONE

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/data/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26898/data/images

Removed Files:
	icon.png 
Log Message:
Useless icon, the XPM works fine under windows.

--- icon.png DELETED ---