super-tux-commit Mailing List for Super Tux (Page 53)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
|
From: Ryan F. <sik...@us...> - 2004-06-14 22:13:58
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18037 Modified Files: texture.cpp texture.h Log Message: - fixed gradient crash bug Index: texture.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- texture.h 10 Jun 2004 14:09:49 -0000 1.6 +++ texture.h 14 Jun 2004 22:13:50 -0000 1.7 @@ -97,7 +97,7 @@ Surface(SDL_Surface* surf, int use_alpha); Surface(const std::string& file, int use_alpha); Surface(const std::string& file, int x, int y, int w, int h, int use_alpha); - Surface(Color top_gradient, Color bottom_gradient, int w, int h); + Surface(Color top_gradient, Color bottom_gradient, int w_, int h_); ~Surface(); /** Reload the surface, which is necesarry in case of a mode swich */ Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- texture.cpp 13 Jun 2004 22:42:13 -0000 1.9 +++ texture.cpp 14 Jun 2004 22:13:50 -0000 1.10 @@ -170,9 +170,12 @@ surfaces.push_back(this); } -Surface::Surface(Color top_background, Color bottom_background, int w, int h) - : data(top_background, bottom_background, w, h), w(0), h(0) +Surface::Surface(Color top_background, Color bottom_background, int w_, int h_) + : data(top_background, bottom_background, 0, 0), w(0), h(0) { + // FIXME: Gradient surfaces currently don't accept width/height + // If nonzero values are passed to data.create(), supertux + // crashes. impl = data.create(); if (impl) { |
|
From: Ingo R. <gr...@us...> - 2004-06-14 22:08:12
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13723 Modified Files: camera.h defines.h gameobjs.cpp gameobjs.h leveleditor.cpp lispwriter.h sector.cpp tile.cpp tile.h tilemap.cpp tilemap.h Log Message: - fixed the bouncybrick artifact bug - replaced plain tile-id integer with a hopefully lightwight struct - replaced a few Tile* with Tile& to make it more clear that Tilemap::get() always returns a valid tile - added support for (grid x y width height) for the .stgt file format, can be used to load multiple tiles from a single image Index: tile.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- tile.h 9 Jun 2004 05:23:20 -0000 1.27 +++ tile.h 14 Jun 2004 22:08:01 -0000 1.28 @@ -141,17 +141,18 @@ const Vector& pos, int layer); static std::set<TileGroup>* tilegroups() { if(!instance_) { instance_ = new TileManager(); } return tilegroups_ ? tilegroups_ : tilegroups_ = new std::set<TileGroup>; } - Tile* get(unsigned int id) { + Tile& get(unsigned int id) { + if(id < tiles.size()) { - return tiles[id]; + return *tiles[id]; } else { // Never return 0, but return the 0th tile instead so that // user code doesn't have to check for NULL pointers all over // the place - return tiles[0]; + return *tiles[0]; } } }; Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- sector.cpp 13 Jun 2004 17:54:28 -0000 1.9 +++ sector.cpp 14 Jun 2004 22:08:01 -0000 1.10 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <memory> +#include <algorithm> #include <stdexcept> #include <iostream> #include <fstream> @@ -761,7 +762,7 @@ throw SuperTuxException(errmsg, __FILE__, __LINE__); */ //Bad tiles (i.e. tiles that are not defined in supertux.stgt but appear in the map) are changed to ID 0 (blank tile) - std::cout << "Warning: Undefined tile at " <<(int)pos.x/32 << "/" << (int)pos.y/32 << " (ID: " << (int)solids->get_tile_id_at(pos) << ")" << std::endl; + std::cout << "Warning: Undefined tile at " <<(int)pos.x/32 << "/" << (int)pos.y/32 << " (ID: " << (int)solids->get_tile_id_at(pos).id << ")" << std::endl; solids->change_at(pos,0); tile = solids->get_tile_at(pos); } Index: lispwriter.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispwriter.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- lispwriter.h 9 Jun 2004 05:23:20 -0000 1.4 +++ lispwriter.h 14 Jun 2004 22:08:01 -0000 1.5 @@ -21,6 +21,7 @@ #define SUPERTUX_LISPWRITER_H #include <iostream> +#include <string> #include <vector> class LispWriter Index: gameobjs.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- gameobjs.h 31 May 2004 02:40:30 -0000 1.26 +++ gameobjs.h 14 Jun 2004 22:08:01 -0000 1.27 @@ -37,6 +37,8 @@ #define NO_BOUNCE 0 #define BOUNCE 1 +struct TileId; + class BouncyDistro : public GameObject { public: @@ -82,7 +84,7 @@ Vector position; float offset; float offset_m; - int shape; + TileId& shape; }; class FloatingScore : public GameObject Index: tilemap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tilemap.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- tilemap.h 9 Jun 2004 05:23:20 -0000 1.7 +++ tilemap.h 14 Jun 2004 22:08:01 -0000 1.8 @@ -31,6 +31,15 @@ class LispReader; class Tile; +struct TileId +{ + TileId() : id(0), hidden(0) {} + explicit TileId(unsigned int i, bool hidden_ = false) : id(i), hidden(hidden_) {} + + unsigned id :31; + unsigned hidden :1; +}; + /** * This class is reponsible for drawing the level tiles */ @@ -63,7 +72,7 @@ bool is_solid() const { return solid; } - unsigned int get_tile_id_at(const Vector& pos) const; + TileId& get_tile_id_at(const Vector& pos); /// returns tile in row y and column y (of the tilemap) Tile* get_tile(int x, int y) const; @@ -74,8 +83,8 @@ void change_at(const Vector& pos, unsigned int newtile); -public: - std::vector<unsigned int> tiles; +private: + std::vector<TileId> tiles; private: TileManager* tilemanager; Index: defines.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/defines.h,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- defines.h 13 Jun 2004 21:48:16 -0000 1.46 +++ defines.h 14 Jun 2004 22:08:01 -0000 1.47 @@ -118,5 +118,7 @@ #define DEBUG_MSG( msg ) {} #endif +#define UNUSED_ARG(a) do {/* null */} while (&a == 0) + #endif /*SUPERTUX_DEFINES_H*/ Index: tilemap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tilemap.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- tilemap.cpp 9 Jun 2004 05:23:20 -0000 1.9 +++ tilemap.cpp 14 Jun 2004 22:08:01 -0000 1.10 @@ -65,9 +65,19 @@ if(!reader.read_int("width", width) || !reader.read_int("height", height)) throw std::runtime_error("No width or height specified in tilemap."); + + std::vector<unsigned int> tmp_tiles; - if(!reader.read_int_vector("tiles", tiles)) + if(!reader.read_int_vector("tiles", tmp_tiles)) throw std::runtime_error("No tiles in tilemap."); + + tiles.resize(tmp_tiles.size()); + for(unsigned int i = 0; i < tmp_tiles.size(); ++i) + { + tiles[i].hidden = false; + tiles[i].id = tmp_tiles[i]; + } + if(int(tiles.size()) != width*height) throw std::runtime_error("wrong number of tiles in tilemap."); } @@ -95,7 +105,14 @@ writer.write_float("speed", speed); writer.write_int("width", width); writer.write_int("height", height); - writer.write_int_vector("tiles", tiles); + + std::vector<unsigned int> tmp_tiles; + tmp_tiles.resize(tiles.size()); + for(unsigned int i = 0; i < tmp_tiles.size(); ++i) + { + tmp_tiles[i] = tiles[i].id; + } + writer.write_int_vector("tiles", tmp_tiles); writer.end_list("tilemap"); } @@ -123,7 +140,8 @@ int tx, ty; for(pos.x = start_x, tx = tsx; pos.x < end_x; pos.x += 32, ++tx) { for(pos.y = start_y, ty = tsy; pos.y < end_y; pos.y += 32, ++ty) { - tilemanager->draw_tile(context, tiles[ty*width + tx], pos, layer); + if (!tiles[ty*width + tx].hidden) + tilemanager->draw_tile(context, tiles[ty*width + tx].id, pos, layer); } } } @@ -134,11 +152,18 @@ { assert(int(newt.size()) == newwidth * newheight); - width = newwidth; + width = newwidth; height = newheight; - tiles = newt; - layer = newlayer; - solid = newsolid; + + tiles.resize(newt.size()); + for(unsigned int i = 0; i < newt.size(); ++i) + { + tiles[i].hidden = false; + tiles[i].id = newt[i]; + } + + layer = newlayer; + solid = newsolid; } void @@ -160,7 +185,7 @@ for(int y = std::min(height, new_height)-1; y >= 0; --y) { for(int x = new_width-1; x >= 0; --x) { if(x >= width) { - tiles[y * new_width + x] = 0; + tiles[y * new_width + x] = TileId(); } else { tiles[y * new_width + x] = tiles[y * width + x]; } @@ -176,9 +201,9 @@ TileMap::get_tile(int x, int y) const { if(x < 0 || x >= width || y < 0 || y >= height) - return tilemanager->get(0); + return &tilemanager->get(0); - return tilemanager->get(tiles[y*width + x]); + return &tilemanager->get(tiles[y*width + x].id); } Tile* @@ -187,11 +212,12 @@ return get_tile(int(pos.x)/32, int(pos.y)/32); } -unsigned int -TileMap::get_tile_id_at(const Vector& pos) const +TileId& +TileMap::get_tile_id_at(const Vector& pos) { int x = int(pos.x)/32; int y = int(pos.y)/32; + return tiles[y*width + x]; } @@ -199,7 +225,7 @@ TileMap::change(int x, int y, unsigned int newtile) { assert(x >= 0 && x < width && y >= 0 && y < height); - tiles[y*width + x] = newtile; + tiles[y*width + x].id = newtile; } void Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.137 retrieving revision 1.138 diff -u -d -r1.137 -r1.138 --- leveleditor.cpp 9 Jun 2004 05:23:19 -0000 1.137 +++ leveleditor.cpp 14 Jun 2004 22:08:01 -0000 1.138 @@ -491,7 +491,7 @@ for(std::vector<int>::const_iterator sit = (*it).tiles.begin(); sit != (*it).tiles.end(); ++sit, ++i) { - Tile& tile = *(TileManager::instance()->get(*sit)); + Tile& tile = TileManager::instance()->get(*sit); Surface* image; if(tile.editor_images.size() > 0) image = tile.editor_images[0]; Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- gameobjs.cpp 9 Jun 2004 05:23:19 -0000 1.39 +++ gameobjs.cpp 14 Jun 2004 22:08:01 -0000 1.40 @@ -80,9 +80,10 @@ } BouncyBrick::BouncyBrick(const Vector& pos) - : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED) -{ - shape = Sector::current()->solids->get_tile_id_at(pos); + : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED), + shape(Sector::current()->solids->get_tile_id_at(pos)) +{ + shape.hidden = true; } void @@ -96,14 +97,17 @@ /* Stop bouncing? */ if (offset >= 0) - remove_me(); + { + shape.hidden = false; + remove_me(); + } } void BouncyBrick::draw(DrawingContext& context) { TileManager::instance()-> - draw_tile(context, shape, position + Vector(0, offset), LAYER_TILES+1); + draw_tile(context, shape.id, position + Vector(0, offset), LAYER_TILES+1); } FloatingScore::FloatingScore(const Vector& pos, int score) Index: camera.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/camera.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- camera.h 9 Jun 2004 05:23:20 -0000 1.8 +++ camera.h 14 Jun 2004 22:08:01 -0000 1.9 @@ -23,6 +23,7 @@ #include <vector> #include <cassert> +#include "defines.h" #include "vector.h" #include "game_object.h" #include "serializable.h" @@ -51,7 +52,7 @@ virtual void draw(DrawingContext& context) { - (void) context; + UNUSED_ARG(context); } void set_scrolling(int scroll_x, int scroll_y) Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- tile.cpp 9 Jun 2004 19:15:22 -0000 1.28 +++ tile.cpp 14 Jun 2004 22:08:01 -0000 1.29 @@ -84,13 +84,27 @@ std::vector<std::string> editor_filenames; reader.read_string_vector("editor-images", editor_filenames); + std::vector<int> grid; + reader.read_int_vector("grid", grid); + // read images for(std::vector<std::string>::iterator i = filenames.begin(); - i != filenames.end(); ++i) { - Surface* surface - = new Surface(datadir + "/images/tilesets/" + *i, USE_ALPHA); - images.push_back(surface); - } + i != filenames.end(); ++i) + { + if (grid.size() == 4) + { + Surface* surface = new Surface(datadir + "/images/tilesets/" + *i, + grid[0], grid[1], grid[2], grid[3], + USE_ALPHA); + images.push_back(surface); + } + else + { + Surface* surface = new Surface(datadir + "/images/tilesets/" + *i, USE_ALPHA); + images.push_back(surface); + } + } + for(std::vector<std::string>::iterator i = editor_filenames.begin(); i != editor_filenames.end(); ++i) { Surface* surface @@ -210,22 +224,20 @@ if(c == 0) return; - Tile* tile = get(c); - if(!tile) - return; + Tile& tile = get(c); - if(!tile->images.size()) + if(!tile.images.size()) return; - if(tile->images.size() > 1) + if(tile.images.size() > 1) { size_t frame - = ((global_frame_counter*25) / tile->anim_speed) % tile->images.size(); - context.draw_surface(tile->images[frame], pos, layer); + = ((global_frame_counter*25) / tile.anim_speed) % tile.images.size(); + context.draw_surface(tile.images[frame], pos, layer); } - else if (tile->images.size() == 1) + else if (tile.images.size() == 1) { - context.draw_surface(tile->images[0], pos, layer); + context.draw_surface(tile.images[0], pos, layer); } } |
|
From: Ingo R. <gr...@us...> - 2004-06-14 21:40:13
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26419 Modified Files: player.cpp badguy.cpp player.h Log Message: - fixed bounce code a bit, should now be useable, bounce high might still need tuning Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.144 retrieving revision 1.145 diff -u -d -r1.144 -r1.145 --- player.cpp 14 Jun 2004 18:34:25 -0000 1.144 +++ player.cpp 14 Jun 2004 21:39:57 -0000 1.145 @@ -1007,16 +1007,16 @@ } void -Player::bounce() +Player::bounce(BadGuy* badguy) { if (input.up) physic.set_velocity_y(5.2); else physic.set_velocity_y(2); - // FIXME: moving tux up looks ugly, but without it tux might collide - // FIXME: with enemies, which he has just jump onto (iceblock) - //base.y = base.y - base.height - 2; + // Move the player a little bit above the badguy to avoid collision + // between badguy and player directly after the bounce has happend + base.y = badguy->base.y - base.height - 2; } /* EOF */ Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- player.h 14 Jun 2004 18:34:25 -0000 1.72 +++ player.h 14 Jun 2004 21:39:58 -0000 1.73 @@ -31,6 +31,8 @@ #include "moving_object.h" #include "physic.h" +class BadGuy; + /* Times: */ #define TUX_SAFE_TIME 1250 @@ -183,7 +185,7 @@ /** let the player jump a bit or more if jump button is hold down (used when you hit a badguy) */ - void bounce(); + void bounce(BadGuy* badguy); bool is_dead() const { return dead; } Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- badguy.cpp 14 Jun 2004 18:34:25 -0000 1.107 +++ badguy.cpp 14 Jun 2004 21:39:57 -0000 1.108 @@ -1028,7 +1028,7 @@ void BadGuy::squish_me(Player* player) { - player->bounce(); + player->bounce(this); Sector::current()->add_score(Vector(base.x, base.y), 50 * player_status.score_multiplier); @@ -1050,7 +1050,7 @@ // mrbomb transforms into a bomb now explode(false); - player->bounce(); + player->bounce(this); Sector::current()->add_score(Vector(base.x, base.y), 50 * player_status.score_multiplier); sound_manager->play_sound(sounds[SND_SQUISH], get_pos()); @@ -1084,7 +1084,7 @@ set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); } - player->bounce(); + player->bounce(this); player_status.score_multiplier++; @@ -1101,7 +1101,7 @@ if(physic.get_velocity_y() >= 0) return; - player->bounce(); + player->bounce(this); Sector::current()->add_score(Vector(base.x, base.y), 25 * player_status.score_multiplier); @@ -1132,7 +1132,7 @@ physic.set_velocity_x(physic.get_velocity_x() * 2.0f); // XXX magic number: 66 is BGM_BIG height - player->bounce(); + player->bounce(this); base.y += 66 - base.height; Sector::current()->add_score(Vector(base.x, base.y), |
|
From: Ingo R. <gr...@us...> - 2004-06-14 18:34:35
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12710 Modified Files: badguy.cpp badguy.h player.h player.cpp Log Message: - added jumping from badguys (hold jump pressed while jumping on one) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.143 retrieving revision 1.144 diff -u -d -r1.143 -r1.144 --- player.cpp 9 Jun 2004 05:23:19 -0000 1.143 +++ player.cpp 14 Jun 2004 18:34:25 -0000 1.144 @@ -1006,3 +1006,18 @@ } } +void +Player::bounce() +{ + if (input.up) + physic.set_velocity_y(5.2); + else + physic.set_velocity_y(2); + + // FIXME: moving tux up looks ugly, but without it tux might collide + // FIXME: with enemies, which he has just jump onto (iceblock) + //base.y = base.y - base.height - 2; +} + +/* EOF */ + Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- player.h 9 Jun 2004 05:23:20 -0000 1.71 +++ player.h 14 Jun 2004 18:34:25 -0000 1.72 @@ -180,6 +180,11 @@ bool tiles_on_air(int tiles); void grow(bool animate); void move(const Vector& vector); + + /** let the player jump a bit or more if jump button is hold down + (used when you hit a badguy) */ + void bounce(); + bool is_dead() const { return dead; } Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- badguy.h 9 Jun 2004 05:23:20 -0000 1.53 +++ badguy.h 14 Jun 2004 18:34:25 -0000 1.54 @@ -160,9 +160,6 @@ * ground */ void fall(); - /** let the player jump a bit (used when you hit a badguy) */ - void make_player_jump(Player* player); - /** Turn enemy into a bomb. To explode right way pass true */ void explode(bool right_away); Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- badguy.cpp 9 Jun 2004 05:23:19 -0000 1.106 +++ badguy.cpp 14 Jun 2004 18:34:25 -0000 1.107 @@ -1026,16 +1026,9 @@ } void -BadGuy::make_player_jump(Player* player) -{ - player->physic.set_velocity_y(2); - player->base.y = base.y - player->base.height - 2; -} - -void BadGuy::squish_me(Player* player) { - make_player_jump(player); + player->bounce(); Sector::current()->add_score(Vector(base.x, base.y), 50 * player_status.score_multiplier); @@ -1057,7 +1050,7 @@ // mrbomb transforms into a bomb now explode(false); - make_player_jump(player); + player->bounce(); Sector::current()->add_score(Vector(base.x, base.y), 50 * player_status.score_multiplier); sound_manager->play_sound(sounds[SND_SQUISH], get_pos()); @@ -1091,7 +1084,7 @@ set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); } - make_player_jump(player); + player->bounce(); player_status.score_multiplier++; @@ -1108,7 +1101,7 @@ if(physic.get_velocity_y() >= 0) return; - make_player_jump(player); + player->bounce(); Sector::current()->add_score(Vector(base.x, base.y), 25 * player_status.score_multiplier); @@ -1139,7 +1132,7 @@ physic.set_velocity_x(physic.get_velocity_x() * 2.0f); // XXX magic number: 66 is BGM_BIG height - make_player_jump(player); + player->bounce(); base.y += 66 - base.height; Sector::current()->add_score(Vector(base.x, base.y), |
|
From: Ingo R. <gr...@us...> - 2004-06-14 18:11:01
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26144 Modified Files: menu.cpp Log Message: - fixed indention and some variables that crossed switch-statements and lead to warnings Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- menu.cpp 9 Jun 2004 05:23:19 -0000 1.79 +++ menu.cpp 14 Jun 2004 18:10:37 -0000 1.80 @@ -767,141 +767,152 @@ void Menu::event(SDL_Event& event) { - SDLKey key; switch(event.type) - { - case SDL_KEYDOWN: - key = event.key.keysym.sym; - SDLMod keymod; - char ch[2]; - keymod = SDL_GetModState(); - int x,y; - - /* If the current unicode character is an ASCII character, - assign it to ch. */ - if ( (event.key.keysym.unicode & 0xFF80) == 0 ) - { - ch[0] = event.key.keysym.unicode & 0x7F; - ch[1] = '\0'; - } - else - { - /* An International Character. */ - } - - if(item[active_item].kind == MN_CONTROLFIELD_KB) { - if(key == SDLK_ESCAPE) + case SDL_KEYDOWN: { - Menu::pop_current(); - return; - } - *item[active_item].int_p = key; - menuaction = MENU_ACTION_DOWN; - return; - } + SDLKey key = key = event.key.keysym.sym; + SDLMod keymod; + char ch[2]; + keymod = SDL_GetModState(); + /* If the current unicode character is an ASCII character, + assign it to ch. */ + if ( (event.key.keysym.unicode & 0xFF80) == 0 ) + { + ch[0] = event.key.keysym.unicode & 0x7F; + ch[1] = '\0'; + } + else + { + /* An International Character. */ + } - switch(key) - { - case SDLK_UP: /* Menu Up */ - menuaction = MENU_ACTION_UP; - break; - case SDLK_DOWN: /* Menu Down */ - menuaction = MENU_ACTION_DOWN; - break; - case SDLK_LEFT: /* Menu Up */ - menuaction = MENU_ACTION_LEFT; - break; - case SDLK_RIGHT: /* Menu Down */ - menuaction = MENU_ACTION_RIGHT; - break; - case SDLK_SPACE: - if(item[active_item].kind == MN_TEXTFIELD) - { - menuaction = MENU_ACTION_INPUT; - mn_input_char = ' '; - break; + if(item[active_item].kind == MN_CONTROLFIELD_KB) + { + if(key == SDLK_ESCAPE) + { + Menu::pop_current(); + return; + } + *item[active_item].int_p = key; + menuaction = MENU_ACTION_DOWN; + return; + } + + + switch(key) + { + case SDLK_UP: /* Menu Up */ + menuaction = MENU_ACTION_UP; + break; + case SDLK_DOWN: /* Menu Down */ + menuaction = MENU_ACTION_DOWN; + break; + case SDLK_LEFT: /* Menu Up */ + menuaction = MENU_ACTION_LEFT; + break; + case SDLK_RIGHT: /* Menu Down */ + menuaction = MENU_ACTION_RIGHT; + break; + case SDLK_SPACE: + if(item[active_item].kind == MN_TEXTFIELD) + { + menuaction = MENU_ACTION_INPUT; + mn_input_char = ' '; + break; + } + case SDLK_RETURN: /* Menu Hit */ + menuaction = MENU_ACTION_HIT; + break; + case SDLK_DELETE: + case SDLK_BACKSPACE: + menuaction = MENU_ACTION_REMOVE; + delete_character++; + break; + case SDLK_ESCAPE: + Menu::pop_current(); + break; + default: + if( (key >= SDLK_0 && key <= SDLK_9) || (key >= SDLK_a && key <= SDLK_z) || (key >= SDLK_SPACE && key <= SDLK_SLASH)) + { + menuaction = MENU_ACTION_INPUT; + mn_input_char = *ch; + } + else + { + mn_input_char = '\0'; + } + break; + } } - case SDLK_RETURN: /* Menu Hit */ - menuaction = MENU_ACTION_HIT; break; - case SDLK_DELETE: - case SDLK_BACKSPACE: - menuaction = MENU_ACTION_REMOVE; - delete_character++; + + case SDL_JOYAXISMOTION: + if(event.jaxis.axis == joystick_keymap.y_axis) + { + if (event.jaxis.value > joystick_keymap.dead_zone && !joystick_timer.started()) + { + menuaction = MENU_ACTION_DOWN; + joystick_timer.start(JOYSTICK_MENU_DELAY); + } + else if (event.jaxis.value < -joystick_keymap.dead_zone && !joystick_timer.started()) + { + menuaction = MENU_ACTION_UP; + joystick_timer.start(JOYSTICK_MENU_DELAY); + } + else + joystick_timer.stop(); + } break; - case SDLK_ESCAPE: - Menu::pop_current(); + case SDL_JOYBUTTONDOWN: + if (item[active_item].kind == MN_CONTROLFIELD_JS) + { + // FIXME: This next line does nothing useable, right? + // *item[active_item].int_p = key; + menuaction = MENU_ACTION_DOWN; + } + menuaction = MENU_ACTION_HIT; break; - default: - if( (key >= SDLK_0 && key <= SDLK_9) || (key >= SDLK_a && key <= SDLK_z) || (key >= SDLK_SPACE && key <= SDLK_SLASH)) - { - menuaction = MENU_ACTION_INPUT; - mn_input_char = *ch; - } - else + + case SDL_MOUSEBUTTONDOWN: { - mn_input_char = '\0'; + int x = event.motion.x; + int y = event.motion.y; + + if(x > pos_x - get_width()/2 && + x < pos_x + get_width()/2 && + y > pos_y - get_height()/2 && + y < pos_y + get_height()/2) + { + menuaction = MENU_ACTION_HIT; + } } break; - } - break; - case SDL_JOYAXISMOTION: - if(event.jaxis.axis == joystick_keymap.y_axis) - { - if (event.jaxis.value > joystick_keymap.dead_zone && !joystick_timer.started()) - { - menuaction = MENU_ACTION_DOWN; - joystick_timer.start(JOYSTICK_MENU_DELAY); - } - else if (event.jaxis.value < -joystick_keymap.dead_zone && !joystick_timer.started()) + + case SDL_MOUSEMOTION: { - menuaction = MENU_ACTION_UP; - joystick_timer.start(JOYSTICK_MENU_DELAY); + int x = event.motion.x; + int y = event.motion.y; + + if(x > pos_x - get_width()/2 && + x < pos_x + get_width()/2 && + y > pos_y - get_height()/2 && + y < pos_y + get_height()/2) + { + active_item = (y - (pos_y - get_height()/2)) / 24; + mouse_cursor->set_state(MC_LINK); + } + else + { + mouse_cursor->set_state(MC_NORMAL); + } } - else - joystick_timer.stop(); - } - break; - case SDL_JOYBUTTONDOWN: - if (item[active_item].kind == MN_CONTROLFIELD_JS) - { - *item[active_item].int_p = key; - menuaction = MENU_ACTION_DOWN; - } - menuaction = MENU_ACTION_HIT; - break; - case SDL_MOUSEBUTTONDOWN: - x = event.motion.x; - y = event.motion.y; - if(x > pos_x - get_width()/2 && - x < pos_x + get_width()/2 && - y > pos_y - get_height()/2 && - y < pos_y + get_height()/2) - { - menuaction = MENU_ACTION_HIT; - } - break; - case SDL_MOUSEMOTION: - x = event.motion.x; - y = event.motion.y; - if(x > pos_x - get_width()/2 && - x < pos_x + get_width()/2 && - y > pos_y - get_height()/2 && - y < pos_y + get_height()/2) - { - active_item = (y - (pos_y - get_height()/2)) / 24; - mouse_cursor->set_state(MC_LINK); - } - else - { - mouse_cursor->set_state(MC_NORMAL); + break; + + default: + break; } - break; - default: - break; - } } |
|
From: Ricardo C. <ri...@ae...> - 2004-06-14 13:20:16
|
Don't bother writting changes to ChangeLog. When releasing, we will just past cvs commits to it. Ricardo Em Domingo, 13 de Junho de 2004 22:48, o Duong-Khang NGUYEN escreveu: > Update of /cvsroot/super-tux/supertux > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13705 > > Modified Files: > ChangeLog configure.ac > Added Files: > config.h.in stamp-h1 > Log Message: > added CONFIG_HEADER and fixed minorest bugs :) > > Index: configure.ac > =================================================================== > RCS file: /cvsroot/super-tux/supertux/configure.ac,v > retrieving revision 1.27 > retrieving revision 1.28 > diff -u -d -r1.27 -r1.28 > --- configure.ac 7 Jun 2004 18:11:11 -0000 1.27 > +++ configure.ac 13 Jun 2004 21:48:15 -0000 1.28 > @@ -12,9 +12,11 @@ > dnl Process this file with autoconf to produce a configure script. > AC_PREREQ([2.54]) > AC_INIT(SuperTux, 0.1.1) > +AC_CONFIG_HEADER(config.h) > AC_CONFIG_SRCDIR([src/supertux.cpp]) > AC_CANONICAL_TARGET > AM_INIT_AUTOMAKE > +AM_CONFIG_HEADER > > SDL_VERSION=1.2.4 > > @@ -47,7 +49,7 @@ > AC_ARG_ENABLE(debug, > AC_HELP_STRING([--enable-debug], [enable debugging mode]),, > enable_debug="yes") if test "x${enable_debug}" != "xno"; then > - CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O0 -g3" > + CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O3 -g" > AC_MSG_RESULT([enabled]) > else > AC_MSG_RESULT([disabled]) > > --- NEW FILE: stamp-h1 --- > timestamp for config.h > > --- NEW FILE: config.h.in --- > /* config.h.in. Generated from configure.ac by autoheader. */ > > /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP > systems. This function is required for `alloca.c' support on those > systems. */ > #undef CRAY_STACKSEG_END > > /* Define to 1 if using `alloca.c'. */ > #undef C_ALLOCA > > /* Define to 1 if translation of program messages to the user's native > language is requested. */ > #undef ENABLE_NLS > > /* Define to 1 if you have `alloca', as a function or macro. */ > #undef HAVE_ALLOCA > > /* Define to 1 if you have <alloca.h> and it should be used (not on > Ultrix). */ > #undef HAVE_ALLOCA_H > > /* Use the Apple OpenGL framework. */ > #undef HAVE_APPLE_OPENGL_FRAMEWORK > > /* Define to 1 if you have the <argz.h> header file. */ > #undef HAVE_ARGZ_H > > /* Define if the GNU dcgettext() function is already present or > preinstalled. */ > #undef HAVE_DCGETTEXT > > /* Define to 1 if you have the <dirent.h> header file, and it defines > `DIR'. */ > #undef HAVE_DIRENT_H > > /* Define to 1 if you have the `feof_unlocked' function. */ > #undef HAVE_FEOF_UNLOCKED > > /* Define to 1 if you have the `fgets_unlocked' function. */ > #undef HAVE_FGETS_UNLOCKED > > /* Define to 1 if you have the `getcwd' function. */ > #undef HAVE_GETCWD > > /* Define to 1 if you have the `getc_unlocked' function. */ > #undef HAVE_GETC_UNLOCKED > > /* Define to 1 if you have the `getegid' function. */ > #undef HAVE_GETEGID > > /* Define to 1 if you have the `geteuid' function. */ > #undef HAVE_GETEUID > > /* Define to 1 if you have the `getgid' function. */ > #undef HAVE_GETGID > > /* Define to 1 if you have the `getpagesize' function. */ > #undef HAVE_GETPAGESIZE > > /* Define if the GNU gettext() function is already present or preinstalled. > */ #undef HAVE_GETTEXT > > /* Define to 1 if you have the `getuid' function. */ > #undef HAVE_GETUID > > /* Define if you have the iconv() function. */ > #undef HAVE_ICONV > > /* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */ > #undef HAVE_INTTYPES_H > > /* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and > declares uintmax_t. */ > #undef HAVE_INTTYPES_H_WITH_UINTMAX > > /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ > #undef HAVE_LANGINFO_CODESET > > /* Define if your <locale.h> file defines LC_MESSAGES. */ > #undef HAVE_LC_MESSAGES > > /* Define to 1 if you have the `SDL_image' library (-lSDL_image). */ > #undef HAVE_LIBSDL_IMAGE > > /* Define to 1 if you have the `SDL_mixer' library (-lSDL_mixer). */ > #undef HAVE_LIBSDL_MIXER > > /* Define to 1 if you have the `z' library (-lz). */ > #undef HAVE_LIBZ > > /* Define to 1 if you have the <limits.h> header file. */ > #undef HAVE_LIMITS_H > > /* Define to 1 if you have the <locale.h> header file. */ > #undef HAVE_LOCALE_H > > /* Define to 1 if you have the <malloc.h> header file. */ > #undef HAVE_MALLOC_H > > /* Define to 1 if you have the <memory.h> header file. */ > #undef HAVE_MEMORY_H > > /* Define to 1 if you have the `mempcpy' function. */ > #undef HAVE_MEMPCPY > > /* Define to 1 if you have the `mkdir' function. */ > #undef HAVE_MKDIR > > /* Define to 1 if you have a working `mmap' system call. */ > #undef HAVE_MMAP > > /* Define to 1 if you have the `munmap' function. */ > #undef HAVE_MUNMAP > > /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. > */ #undef HAVE_NDIR_H > > /* Define to 1 if you have the <nl_types.h> header file. */ > #undef HAVE_NL_TYPES_H > > /* Define if you have POSIX threads libraries and header files. */ > #undef HAVE_PTHREAD > > /* Define to 1 if you have the `putenv' function. */ > #undef HAVE_PUTENV > > /* Define to 1 if you have the `setenv' function. */ > #undef HAVE_SETENV > > /* Define to 1 if you have the `setlocale' function. */ > #undef HAVE_SETLOCALE > > /* Define to 1 if you have the <stddef.h> header file. */ > #undef HAVE_STDDEF_H > > /* Define to 1 if you have the <stdint.h> header file. */ > #undef HAVE_STDINT_H > > /* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and > declares uintmax_t. */ > #undef HAVE_STDINT_H_WITH_UINTMAX > > /* Define to 1 if you have the <stdlib.h> header file. */ > #undef HAVE_STDLIB_H > > /* Define to 1 if you have the `stpcpy' function. */ > #undef HAVE_STPCPY > > /* Define to 1 if you have the `strcasecmp' function. */ > #undef HAVE_STRCASECMP > > /* Define to 1 if you have the `strdup' function. */ > #undef HAVE_STRDUP > > /* Define to 1 if you have the <strings.h> header file. */ > #undef HAVE_STRINGS_H > > /* Define to 1 if you have the <string.h> header file. */ > #undef HAVE_STRING_H > > /* Define to 1 if you have the `strstr' function. */ > #undef HAVE_STRSTR > > /* Define to 1 if you have the `strtoul' function. */ > #undef HAVE_STRTOUL > > /* Define to 1 if you have the <sys/dir.h> header file, and it defines > `DIR'. */ > #undef HAVE_SYS_DIR_H > > /* Define to 1 if you have the <sys/ndir.h> header file, and it defines > `DIR'. */ > #undef HAVE_SYS_NDIR_H > > /* Define to 1 if you have the <sys/param.h> header file. */ > #undef HAVE_SYS_PARAM_H > > /* Define to 1 if you have the <sys/stat.h> header file. */ > #undef HAVE_SYS_STAT_H > > /* Define to 1 if you have the <sys/types.h> header file. */ > #undef HAVE_SYS_TYPES_H > > /* Define to 1 if you have the `tsearch' function. */ > #undef HAVE_TSEARCH > > /* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. > */ #undef HAVE_UINTMAX_T > > /* Define to 1 if you have the <unistd.h> header file. */ > #undef HAVE_UNISTD_H > > /* Define if you have the unsigned long long type. */ > #undef HAVE_UNSIGNED_LONG_LONG > > /* Define to 1 if you have the <windows.h> header file. */ > #undef HAVE_WINDOWS_H > > /* Define to 1 if you have the `__argz_count' function. */ > #undef HAVE___ARGZ_COUNT > > /* Define to 1 if you have the `__argz_next' function. */ > #undef HAVE___ARGZ_NEXT > > /* Define to 1 if you have the `__argz_stringify' function. */ > #undef HAVE___ARGZ_STRINGIFY > > /* Define to 1 if you have the `__fsetlocking' function. */ > #undef HAVE___FSETLOCKING > > /* Define as const if the declaration of iconv() needs const. */ > #undef ICONV_CONST > > /* Define if integer division by zero raises signal SIGFPE. */ > #undef INTDIV0_RAISES_SIGFPE > > /* Name of package */ > #undef PACKAGE > > /* Define to the address where bug reports for this package should be sent. > */ #undef PACKAGE_BUGREPORT > > /* Define to the full name of this package. */ > #undef PACKAGE_NAME > > /* Define to the full name and version of this package. */ > #undef PACKAGE_STRING > > /* Define to the one symbol short name of this package. */ > #undef PACKAGE_TARNAME > > /* Define to the version of this package. */ > #undef PACKAGE_VERSION > > /* Define if <inttypes.h> exists and defines unusable PRI* macros. */ > #undef PRI_MACROS_BROKEN > > /* Define to the necessary symbol if this constant uses a non-standard name > on your system. */ > #undef PTHREAD_CREATE_JOINABLE > > /* If using the C implementation of alloca, define if you know the > direction of stack growth for your system; otherwise it will be > automatically deduced at run-time. > STACK_DIRECTION > 0 => grows toward higher addresses > STACK_DIRECTION < 0 => grows toward lower addresses > STACK_DIRECTION = 0 => direction of growth unknown */ > #undef STACK_DIRECTION > > /* Define to 1 if you have the ANSI C header files. */ > #undef STDC_HEADERS > > /* Version number of package */ > #undef VERSION > > /* Define to empty if `const' does not conform to ANSI C. */ > #undef const > > /* Define as `__inline' if that's what the C compiler calls it, or to > nothing if it is not supported. */ > #undef inline > > /* Define to `long' if <sys/types.h> does not define. */ > #undef off_t > > /* Define to `unsigned' if <sys/types.h> does not define. */ > #undef size_t > > /* Define to unsigned long or unsigned long long if <stdint.h> and > <inttypes.h> don't define. */ > #undef uintmax_t > > Index: ChangeLog > =================================================================== > RCS file: /cvsroot/super-tux/supertux/ChangeLog,v > retrieving revision 1.8 > retrieving revision 1.9 > diff -u -d -r1.8 -r1.9 > --- ChangeLog 7 Jun 2004 18:11:02 -0000 1.8 > +++ ChangeLog 13 Jun 2004 21:48:14 -0000 1.9 > @@ -1,5 +1,17 @@ > +- SuperTux changes - > +http://super-tux.sf.net/ > + > +Last update: May 3, 2004 > + > +2004-06-13 neoneurone <neo...@us...> > + > + * configure.ac: added CONFIG_HEADER > + * special.cpp: added "sprite = NULL;" > + * background.cpp: fix "br" variable, replaced by "bg" > + > 2004-06-07 neoneurone <neo...@us...> > > +2004-06-07 neoneurone <neo...@us...> > * Makefile.am, configure.ac, autogen.sh: minor changes > for using automake version 1.6 > > @@ -24,11 +36,6 @@ > (EXTRA_DIST): Add config.rpath. > * configure.ac (AC_OUTPUT): Add po/Makefile.in, > > -- SuperTux changes - > -http://super-tux.sf.net/ > - > -Last update: May 3, 2004 > - > Milestone 0.1.1 - May 11, 2004 > ----------------------------- > > > > > ------------------------------------------------------- > This SF.Net email is sponsored by the new InstallShield X. > From Windows to Linux, servers to mobile, InstallShield X is the > one installation-authoring solution that does it all. Learn more and > evaluate today! http://www.installshield.com/Dev2Dev/0504 > _______________________________________________ > Super-tux-commit mailing list > Sup...@li... > https://lists.sourceforge.net/lists/listinfo/super-tux-commit -- More are taken in by hope than by cunning. -- Vauvenargues |
|
From: Ingo R. <gr...@us...> - 2004-06-13 22:42:26
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24191/screen Modified Files: texture.cpp Log Message: - fixed argument-shadowing issue 'this->w vs w' Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- texture.cpp 13 Jun 2004 18:31:37 -0000 1.8 +++ texture.cpp 13 Jun 2004 22:42:13 -0000 1.9 @@ -449,9 +449,10 @@ h = sdl_surface->h; } -SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int x, int y, int w, int h, int use_alpha) +SurfaceOpenGL::SurfaceOpenGL(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_) { - sdl_surface = sdl_surface_part_from_file(file,x,y,w,h,use_alpha); + sdl_surface = sdl_surface_part_from_file(file_,x_,y_,w_,h_,use_alpha_); + create_gl(sdl_surface, &gl_texture); w = sdl_surface->w; |
|
From: Duong-Khang N. <neo...@us...> - 2004-06-13 22:24:16
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9909 Modified Files: configure.ac Log Message: removed obsolete AM_CONFIG_HEADER Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- configure.ac 13 Jun 2004 22:05:22 -0000 1.29 +++ configure.ac 13 Jun 2004 22:24:06 -0000 1.30 @@ -12,10 +12,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) AC_INIT(SuperTux, 0.1.1) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE +dnl This is obsolete see automake1.7 // AM_CONFIG_HEADER SDL_VERSION=1.2.4 |
|
From: Ingo R. <gr...@us...> - 2004-06-13 22:05:30
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28011 Modified Files: configure.ac Log Message: - fixed configure.ac's AM_CONFIG_HEADER issue Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- configure.ac 13 Jun 2004 21:48:15 -0000 1.28 +++ configure.ac 13 Jun 2004 22:05:22 -0000 1.29 @@ -12,11 +12,10 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) AC_INIT(SuperTux, 0.1.1) -AC_CONFIG_HEADER(config.h) +AM_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE -AM_CONFIG_HEADER SDL_VERSION=1.2.4 |
|
From: Ingo R. <gr...@us...> - 2004-06-13 21:57:18
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21346 Added Files: Makefile Log Message: dummy makefile to ease compilation under emacs a bit --- NEW FILE: Makefile --- all: cd .. && $(MAKE) # EOF # |
|
From: Duong-Khang N. <neo...@us...> - 2004-06-13 21:48:28
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13705 Modified Files: ChangeLog configure.ac Added Files: config.h.in stamp-h1 Log Message: added CONFIG_HEADER and fixed minorest bugs :) Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- configure.ac 7 Jun 2004 18:11:11 -0000 1.27 +++ configure.ac 13 Jun 2004 21:48:15 -0000 1.28 @@ -12,9 +12,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) AC_INIT(SuperTux, 0.1.1) +AC_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE +AM_CONFIG_HEADER SDL_VERSION=1.2.4 @@ -47,7 +49,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="yes") if test "x${enable_debug}" != "xno"; then - CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O0 -g3" + CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O3 -g" AC_MSG_RESULT([enabled]) else AC_MSG_RESULT([disabled]) --- NEW FILE: stamp-h1 --- timestamp for config.h --- NEW FILE: config.h.in --- /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ #undef CRAY_STACKSEG_END /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). */ #undef HAVE_ALLOCA_H /* Use the Apple OpenGL framework. */ #undef HAVE_APPLE_OPENGL_FRAMEWORK /* Define to 1 if you have the <argz.h> header file. */ #undef HAVE_ARGZ_H /* Define if the GNU dcgettext() function is already present or preinstalled. */ #undef HAVE_DCGETTEXT /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the `feof_unlocked' function. */ #undef HAVE_FEOF_UNLOCKED /* Define to 1 if you have the `fgets_unlocked' function. */ #undef HAVE_FGETS_UNLOCKED /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD /* Define to 1 if you have the `getc_unlocked' function. */ #undef HAVE_GETC_UNLOCKED /* Define to 1 if you have the `getegid' function. */ #undef HAVE_GETEGID /* Define to 1 if you have the `geteuid' function. */ #undef HAVE_GETEUID /* Define to 1 if you have the `getgid' function. */ #undef HAVE_GETGID /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID /* Define if you have the iconv() function. */ #undef HAVE_ICONV /* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */ #undef HAVE_INTTYPES_H /* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. */ #undef HAVE_INTTYPES_H_WITH_UINTMAX /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET /* Define if your <locale.h> file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES /* Define to 1 if you have the `SDL_image' library (-lSDL_image). */ #undef HAVE_LIBSDL_IMAGE /* Define to 1 if you have the `SDL_mixer' library (-lSDL_mixer). */ #undef HAVE_LIBSDL_MIXER /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H /* Define to 1 if you have the <locale.h> header file. */ #undef HAVE_LOCALE_H /* Define to 1 if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have the `mempcpy' function. */ #undef HAVE_MEMPCPY /* Define to 1 if you have the `mkdir' function. */ #undef HAVE_MKDIR /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ #undef HAVE_NDIR_H /* Define to 1 if you have the <nl_types.h> header file. */ #undef HAVE_NL_TYPES_H /* Define if you have POSIX threads libraries and header files. */ #undef HAVE_PTHREAD /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV /* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE /* Define to 1 if you have the <stddef.h> header file. */ #undef HAVE_STDDEF_H /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H /* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. */ #undef HAVE_STDINT_H_WITH_UINTMAX /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H /* Define to 1 if you have the `stpcpy' function. */ #undef HAVE_STPCPY /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H /* Define to 1 if you have the `strstr' function. */ #undef HAVE_STRSTR /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_NDIR_H /* Define to 1 if you have the <sys/param.h> header file. */ #undef HAVE_SYS_PARAM_H /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H /* Define to 1 if you have the `tsearch' function. */ #undef HAVE_TSEARCH /* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */ #undef HAVE_UINTMAX_T /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H /* Define if you have the unsigned long long type. */ #undef HAVE_UNSIGNED_LONG_LONG /* Define to 1 if you have the <windows.h> header file. */ #undef HAVE_WINDOWS_H /* Define to 1 if you have the `__argz_count' function. */ #undef HAVE___ARGZ_COUNT /* Define to 1 if you have the `__argz_next' function. */ #undef HAVE___ARGZ_NEXT /* Define to 1 if you have the `__argz_stringify' function. */ #undef HAVE___ARGZ_STRINGIFY /* Define to 1 if you have the `__fsetlocking' function. */ #undef HAVE___FSETLOCKING /* Define as const if the declaration of iconv() needs const. */ #undef ICONV_CONST /* Define if integer division by zero raises signal SIGFPE. */ #undef INTDIV0_RAISES_SIGFPE /* Name of package */ #undef PACKAGE /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT /* Define to the full name of this package. */ #undef PACKAGE_NAME /* Define to the full name and version of this package. */ #undef PACKAGE_STRING /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME /* Define to the version of this package. */ #undef PACKAGE_VERSION /* Define if <inttypes.h> exists and defines unusable PRI* macros. */ #undef PRI_MACROS_BROKEN /* Define to the necessary symbol if this constant uses a non-standard name on your system. */ #undef PTHREAD_CREATE_JOINABLE /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Version number of package */ #undef VERSION /* Define to empty if `const' does not conform to ANSI C. */ #undef const /* Define as `__inline' if that's what the C compiler calls it, or to nothing if it is not supported. */ #undef inline /* Define to `long' if <sys/types.h> does not define. */ #undef off_t /* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t /* Define to unsigned long or unsigned long long if <stdint.h> and <inttypes.h> don't define. */ #undef uintmax_t Index: ChangeLog =================================================================== RCS file: /cvsroot/super-tux/supertux/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChangeLog 7 Jun 2004 18:11:02 -0000 1.8 +++ ChangeLog 13 Jun 2004 21:48:14 -0000 1.9 @@ -1,5 +1,17 @@ +- SuperTux changes - +http://super-tux.sf.net/ + +Last update: May 3, 2004 + +2004-06-13 neoneurone <neo...@us...> + + * configure.ac: added CONFIG_HEADER + * special.cpp: added "sprite = NULL;" + * background.cpp: fix "br" variable, replaced by "bg" + 2004-06-07 neoneurone <neo...@us...> +2004-06-07 neoneurone <neo...@us...> * Makefile.am, configure.ac, autogen.sh: minor changes for using automake version 1.6 @@ -24,11 +36,6 @@ (EXTRA_DIST): Add config.rpath. * configure.ac (AC_OUTPUT): Add po/Makefile.in, -- SuperTux changes - -http://super-tux.sf.net/ - -Last update: May 3, 2004 - Milestone 0.1.1 - May 11, 2004 ----------------------------- |
|
From: Duong-Khang N. <neo...@us...> - 2004-06-13 21:48:27
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13705/po Modified Files: de.po es.po pt.po Log Message: added CONFIG_HEADER and fixed minorest bugs :) Index: pt.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/pt.po,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pt.po 10 Jun 2004 13:54:20 -0000 1.9 +++ pt.po 13 Jun 2004 21:48:15 -0000 1.10 @@ -9,7 +9,6 @@ msgid "" msgstr "" "Project-Id-Version: pt\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-10 14:53+0100\n" "Last-Translator: Ricardo Cruz <ri...@ae...>\n" @@ -17,6 +16,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: sup...@li...\n" "X-Generator: KBabel 1.3\n" #: src/gameloop.cpp:163 @@ -374,4 +374,3 @@ #: src/worldmap.cpp:723 msgid "GAMEOVER" msgstr "FIM DO JOGO" - Index: es.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/es.po,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- es.po 10 Jun 2004 18:28:11 -0000 1.9 +++ es.po 13 Jun 2004 21:48:15 -0000 1.10 @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux-CVS\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-09 23:10+0200\n" "Last-Translator: Javier Beaumont <dem...@us...>\n" @@ -15,6 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: sup...@li...\n" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -27,6 +27,7 @@ msgstr "PAUSA - Pulsa 'P' para continuar" #: src/gameloop.cpp:528 +#, c-format msgid "Playing: " msgstr "Jugando: " Index: de.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/de.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- de.po 10 Jun 2004 13:54:20 -0000 1.7 +++ de.po 13 Jun 2004 21:48:15 -0000 1.8 @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux 0.1.1\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-03 00:29+0200\n" "Last-Translator: <ma...@br...>\n" @@ -15,6 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: sup...@li...\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/gameloop.cpp:163 |
|
From: Duong-Khang N. <neo...@us...> - 2004-06-13 21:48:27
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13705/src Modified Files: background.cpp defines.h special.cpp Log Message: added CONFIG_HEADER and fixed minorest bugs :) Index: defines.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/defines.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- defines.h 9 Jun 2004 05:23:20 -0000 1.45 +++ defines.h 13 Jun 2004 21:48:16 -0000 1.46 @@ -20,7 +20,9 @@ // 02111-1307, USA. #ifndef SUPERTUX_DEFINES_H -#define SUPERTUX_DEFINES_H +#define SUPERTUX_DEFINES_H 1 + +#include <config.h> /* Version: */ Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- background.cpp 12 Jun 2004 15:48:50 -0000 1.9 +++ background.cpp 13 Jun 2004 21:48:16 -0000 1.10 @@ -39,7 +39,7 @@ int tr, tg, tb, br, bg, bb; if(reader.read_int("top_red", tr) && reader.read_int("top_green", tg) && reader.read_int("top_blue", tb) && reader.read_int("bottom_red", br) - && reader.read_int("bottom_green", br) + && reader.read_int("bottom_green", bg) && reader.read_int("bottom_blue", bb)) { set_gradient(Color(tr, tg, tb), Color(br, bg, bb)); } Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- special.cpp 12 Jun 2004 21:13:34 -0000 1.60 +++ special.cpp 13 Jun 2004 21:48:16 -0000 1.61 @@ -263,6 +263,7 @@ case UPGRADE_1UP: sprite = img_1up; break; default: assert(!"wrong type in Powerup::draw()"); + sprite = NULL; // added by neoneurone, g++ likes this ! } if(base.height < 32) // still raising up? |
|
From: Ingo R. <gr...@us...> - 2004-06-13 18:31:46
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10059/screen Modified Files: texture.cpp Log Message: - some code to figure out the internal format for opengl mode, makes 16bit color mode look much better Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- texture.cpp 12 Jun 2004 16:07:12 -0000 1.7 +++ texture.cpp 13 Jun 2004 18:31:37 -0000 1.8 @@ -509,6 +509,30 @@ SDL_SetAlpha(surf, saved_flags, saved_alpha); } + // We check all the pixels of the surface to figure out which + // internal format OpenGL should use for storing it, ie. if no alpha + // is present store in RGB instead of RGBA, this saves a few bytes + // of memory, but much more importantly it makes the game look + // *much* better in 16bit color mode + int internal_format = GL_RGB10_A2; + bool has_alpha = false; + + unsigned char* buf = static_cast<unsigned char*>(conv->pixels); + for (int y = 0; y < surf->h; ++y) + for (int x = 0; x < surf->w; ++x) + { + if (buf[(conv->pitch*y + x*4) + 3] != 255) + { + has_alpha = true; + break; + } + } + + if (!has_alpha) + { + internal_format = GL_RGB; + } + glGenTextures(1, &*tex); glBindTexture(GL_TEXTURE_2D , *tex); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); @@ -516,7 +540,7 @@ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glPixelStorei(GL_UNPACK_ROW_LENGTH, conv->pitch / conv->format->BytesPerPixel); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, conv->pixels); + glTexImage2D(GL_TEXTURE_2D, 0, internal_format, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, conv->pixels); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); SDL_FreeSurface(conv); |
|
From: Benjamin P. J. <lit...@us...> - 2004-06-13 17:56:51
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11285/data/images/tilesets Modified Files: supertux.stgt Log Message: - Ooops! After having b0rked supertux.stgt: fixed it again. Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- supertux.stgt 13 Jun 2004 17:50:26 -0000 1.37 +++ supertux.stgt 13 Jun 2004 17:56:43 -0000 1.38 @@ -575,12 +575,12 @@ (images "jungle12-1.png") (images "jungle12-2.png") (images "jungle12-3.png") - (images "jungle12-4.png")) - (images "jungle12-4.png")) - (images "jungle12-4.png")) - (images "jungle12-4.png")) + (images "jungle12-4.png") + (images "jungle12-4.png") + (images "jungle12-4.png") + (images "jungle12-4.png") (images "jungle12-3.png") - (images "jungle12-2.png") + (images "jungle12-2.png")) ; Spike (tile (id 200) |
|
From: Ingo R. <gr...@us...> - 2004-06-13 17:54:37
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9632 Modified Files: sector.cpp Log Message: - read gravity has real, instead of int Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- sector.cpp 9 Jun 2004 05:23:19 -0000 1.8 +++ sector.cpp 13 Jun 2004 17:54:28 -0000 1.9 @@ -72,13 +72,14 @@ for(lisp_object_t* cur = lispreader.get_lisp(); !lisp_nil_p(cur); cur = lisp_cdr(cur)) { std::string token = lisp_symbol(lisp_car(lisp_car(cur))); + // FIXME: doesn't handle empty data lisp_object_t* data = lisp_car(lisp_cdr(lisp_car(cur))); LispReader reader(lisp_cdr(lisp_car(cur))); if(token == "name") { name = lisp_string(data); } else if(token == "gravity") { - gravity = lisp_integer(data); + gravity = lisp_real(data); } else if(token == "music") { song_title = lisp_string(data); load_music(); |
|
From: Benjamin P. J. <lit...@us...> - 2004-06-13 17:50:45
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5806/data/images/tilesets Modified Files: supertux.stgt Log Message: Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- supertux.stgt 10 Jun 2004 17:58:09 -0000 1.36 +++ supertux.stgt 13 Jun 2004 17:50:26 -0000 1.37 @@ -17,7 +17,7 @@ (tilegroup (name "Grey") (tiles 64 65 66 67 68 69)) (tilegroup (name "Signs") (tiles 136 137 138 139 141 142 143 144)) (tilegroup (name "Grasslands") (tiles 145 146 147 148)) - (tilegroup (name "Jungle") (tiles 301 302 303 304 305 306 307 308 309)) + (tilegroup (name "Jungle") (tiles 301 302 303 304 305 306 307 308 309 310 311 312)) (tile (id 0) (images "notile.png")) @@ -560,6 +560,27 @@ (tile (id 309) (solid #t) (images "jungle9.png")) + (tile (id 310) + (solid #t) + (images "jungle10.png")) + (tile (id 311) + (solid #t) + (images "jungle11.png")) + (tile (id 312) + (solid #t) + (anim-speed 300) + (images "jungle12-1.png") + (images "jungle12-1.png") + (images "jungle12-1.png") + (images "jungle12-1.png") + (images "jungle12-2.png") + (images "jungle12-3.png") + (images "jungle12-4.png")) + (images "jungle12-4.png")) + (images "jungle12-4.png")) + (images "jungle12-4.png")) + (images "jungle12-3.png") + (images "jungle12-2.png") ; Spike (tile (id 200) |
|
From: Benjamin P. J. <lit...@us...> - 2004-06-13 17:47:26
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2925/data/images/tilesets Added Files: jungle12-1.png jungle12-3.png jungle12-4.png jungle12-2.png Log Message: - Added jungle12-{1..4}.png --- NEW FILE: jungle12-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle12-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle12-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle12-4.png --- (This appears to be a binary file; contents omitted.) |
|
From: Benjamin P. J. <lit...@us...> - 2004-06-13 17:40:49
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28423/data/images/shared Added Files: trampoline2-1.png trampoline2-3.png trampoline2-4.png trampoline2-2.png Log Message: - Added a 2nd trampoline (to be used as a non carryable, thus having 'fixed' position) --- NEW FILE: trampoline2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: trampoline2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: trampoline2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: trampoline2-3.png --- (This appears to be a binary file; contents omitted.) |
|
From: Marek M. <wa...@us...> - 2004-06-12 21:13:43
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25909/data/levels/world1 Modified Files: level11.stl Log Message: Improved (?) ice bullet physics Fixed design bug in level 11: tux could jump over the ending sequence which then wouldn't be played - code should be changed to generally prevent that from happening Index: level11.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level11.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level11.stl 8 Jun 2004 17:44:10 -0000 1.14 +++ level11.stl 12 Jun 2004 21:13:34 -0000 1.15 @@ -23,12 +23,12 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 102 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 28 28 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 128 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 0 0 0 0 0 0 0 0 0 0 26 112 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 - 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 31 11 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 44 44 44 44 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 51 52 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 - 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 26 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 59 60 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 28 28 28 28 28 28 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 22 11 21 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 50 49 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 - 11 11 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 26 26 28 28 29 0 0 0 0 0 0 0 27 28 28 102 26 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 23 11 20 14 15 0 0 0 0 0 0 0 48 48 48 48 26 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 0 0 51 52 48 0 51 52 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 - 11 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 26 26 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 22 11 11 11 11 11 21 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 26 48 48 48 48 0 0 48 48 48 26 48 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 50 49 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 126 0 0 0 0 0 0 0 132 132 0 0 0 0 0 + 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 31 11 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 44 44 44 44 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 + 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 26 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 59 60 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 28 28 28 28 28 28 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 22 11 21 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 + 11 11 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 26 26 28 28 29 0 0 0 0 0 0 0 27 28 28 102 26 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 23 11 20 14 15 0 0 0 0 0 0 0 48 48 48 48 26 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 + 11 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 26 26 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 22 11 11 11 11 11 21 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 26 48 48 48 48 0 0 48 48 48 26 48 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 50 49 48 0 50 49 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 126 0 0 0 0 0 0 0 132 132 0 0 0 0 0 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 78 78 78 78 78 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 23 11 11 11 11 11 20 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 51 52 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 - 11 12 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 7 8 8 8 8 8 8 8 8 8 8 9 0 0 0 7 8 8 8 9 0 0 7 8 8 8 9 0 0 0 13 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 22 11 11 11 11 11 11 11 11 11 21 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 50 49 0 0 50 49 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 + 11 12 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 7 8 8 8 8 8 8 8 8 8 8 9 0 0 0 7 8 8 8 9 0 0 7 8 8 8 9 0 0 0 13 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 22 11 11 11 11 11 11 11 11 11 21 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 48 0 0 0 50 49 0 0 50 49 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 9 0 0 16 31 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 30 18 0 0 0 13 14 14 14 14 14 14 14 14 14 14 15 0 0 0 13 14 14 14 15 0 0 13 14 14 14 15 0 0 0 10 11 11 11 12 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 59 60 9 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 26 26 0 0 26 26 26 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 23 11 11 11 11 11 19 11 11 11 20 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 0 0 0 0 0 0 51 52 0 48 51 52 48 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 9 0 0 0 0 0 0 7 8 8 8 9 0 0 0 0 0 0 13 14 14 14 15 0 0 0 10 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 30 18 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 12 0 0 10 11 11 11 12 0 0 0 16 17 17 17 18 0 0 0 0 0 0 57 58 0 0 59 60 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 48 48 57 58 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 22 11 11 11 21 9 0 0 0 0 0 0 0 0 0 0 7 8 22 11 11 11 11 11 11 11 11 11 11 11 11 11 21 8 9 0 0 0 0 0 48 48 48 48 48 48 48 48 0 0 48 48 48 48 48 48 48 48 48 0 0 48 48 48 48 48 48 48 48 48 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 21 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 11 21 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 7 8 8 8 9 0 0 0 0 0 0 0 7 8 8 8 9 0 0 0 0 0 0 13 14 14 14 15 0 0 0 0 0 0 13 14 14 14 15 0 0 0 0 0 0 10 11 11 19 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 16 31 11 11 11 11 11 11 11 11 30 18 0 0 0 16 31 11 11 12 0 0 10 11 11 30 18 0 0 0 0 0 0 0 0 0 0 7 8 8 8 59 60 8 8 59 60 8 8 8 8 8 9 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 13 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 48 48 59 60 0 0 59 60 48 48 57 58 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 23 11 11 11 20 15 0 0 0 0 0 0 0 0 0 0 13 14 23 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 31 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 7 51 52 8 8 8 8 8 8 8 8 8 133 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 0 0 0 0 0 0 0 0 132 132 8 8 8 8 8 |
|
From: Marek M. <wa...@us...> - 2004-06-12 21:13:43
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25909/src Modified Files: special.cpp Log Message: Improved (?) ice bullet physics Fixed design bug in level 11: tux could jump over the ending sequence which then wouldn't be played - code should be changed to generally prevent that from happening Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- special.cpp 9 Jun 2004 05:23:20 -0000 1.59 +++ special.cpp 12 Jun 2004 21:13:34 -0000 1.60 @@ -84,7 +84,7 @@ physic.apply(elapsed_time, base.x, base.y); collision_swept_object_map(&old_base,&base); - if (issolid(base.x, base.y + 4) || issolid(base.x, base.y)) + if (issolid(base.x+2, base.y + 4) || issolid(base.x+2, base.y)) { base.y = old_y; physic.set_velocity_y(-physic.get_velocity_y()); @@ -118,7 +118,8 @@ remove_me(); else if (kind == ICE_BULLET) { - physic.set_velocity_x(physic.get_velocity_x() * -1); + physic.set_velocity_x(-physic.get_velocity_x()); + //physic.set_velocity_y(-physic.get_velocity_y()); } } } |
|
From: Marek M. <wa...@us...> - 2004-06-12 21:13:42
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25909 Modified Files: TODO Log Message: Improved (?) ice bullet physics Fixed design bug in level 11: tux could jump over the ending sequence which then wouldn't be played - code should be changed to generally prevent that from happening Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- TODO 10 Jun 2004 16:03:16 -0000 1.70 +++ TODO 12 Jun 2004 21:13:34 -0000 1.71 @@ -76,7 +76,8 @@ [L] we only have a global counter for multiple coin blocks. This should be handled per block. [L] Show level number on top of the screen when playing the level -[L] fix the door animation +[L] Fix the door animation +[L] Prevent Tux from being able to jump over ending sequence triggers Beyond Milestone2 ----------------- |
|
From: Ricardo C. <rm...@us...> - 2004-06-12 16:07:21
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25597/src/screen Modified Files: drawing_context.cpp screen.h texture.cpp Log Message: Optimized gradient when top color is the same as the bottom one. Index: drawing_context.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- drawing_context.cpp 9 Jun 2004 04:43:15 -0000 1.7 +++ drawing_context.cpp 12 Jun 2004 16:07:12 -0000 1.8 @@ -181,15 +181,22 @@ else { #endif - float redstep = (float(bottom.red)-float(top.red)) / float(screen->h); - float greenstep = (float(bottom.green)-float(top.green)) / float(screen->h); - float bluestep = (float(bottom.blue) - float(top.blue)) / float(screen->h); + if(&top == &bottom) + { + fillrect(0, 0, screen->w, screen->h, top.red, top.green, top.blue); + } + else + { + float redstep = (float(bottom.red)-float(top.red)) / float(screen->h); + float greenstep = (float(bottom.green)-float(top.green)) / float(screen->h); + float bluestep = (float(bottom.blue) - float(top.blue)) / float(screen->h); - for(float y = 0; y < screen->h; y += 2) - fillrect(0, (int)y, screen->w, 2, - int(float(top.red) + redstep * y), - int(float(top.green) + greenstep * y), - int(float(top.blue) + bluestep * y), 255); + for(float y = 0; y < screen->h; y += 2) + fillrect(0, (int)y, screen->w, 2, + int(float(top.red) + redstep * y), + int(float(top.green) + greenstep * y), + int(float(top.blue) + bluestep * y), 255); + } #ifndef NOOPENGL } Index: screen.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/screen.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- screen.h 10 Jun 2004 14:09:49 -0000 1.3 +++ screen.h 12 Jun 2004 16:07:12 -0000 1.4 @@ -24,7 +24,7 @@ #ifndef NOOPENGL #include <SDL_opengl.h> #endif - +#include <iostream> class Color { public: @@ -40,6 +40,12 @@ : red(o.red), green(o.green), blue(o.blue), alpha(o.alpha) { } + bool operator==(const Color& o) + { if(red == o.red && green == o.green && + blue == o.blue && alpha == o.alpha) + return true; + return false; } + Uint8 red, green, blue, alpha; }; Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- texture.cpp 12 Jun 2004 15:42:24 -0000 1.6 +++ texture.cpp 12 Jun 2004 16:07:12 -0000 1.7 @@ -373,21 +373,29 @@ if(sdl_surface == NULL) st_abort("Cannot create surface for the gradient", "SURFACE"); - float redstep = (float(bottom.red)-float(top.red)) / float(h); - float greenstep = (float(bottom.green)-float(top.green)) / float(h); - float bluestep = (float(bottom.blue) - float(top.blue)) / float(h); - - SDL_Rect rect; - rect.x = 0; - rect.w = w; - rect.h = 1; - for(float y = 0; y < h; y++) + if(top == bottom) { - rect.y = (int)y; - SDL_FillRect(sdl_surface, &rect, SDL_MapRGB(sdl_surface->format, - int(float(top.red) + redstep * y), - int(float(top.green) + greenstep * y), - int(float(top.blue) + bluestep * y))); + SDL_FillRect(sdl_surface, NULL, SDL_MapRGB(sdl_surface->format, + top.red, top.green, top.blue)); + } + else + { + float redstep = (float(bottom.red)-float(top.red)) / float(h); + float greenstep = (float(bottom.green)-float(top.green)) / float(h); + float bluestep = (float(bottom.blue) - float(top.blue)) / float(h); + + SDL_Rect rect; + rect.x = 0; + rect.w = w; + rect.h = 1; + for(float y = 0; y < h; y++) + { + rect.y = (int)y; + SDL_FillRect(sdl_surface, &rect, SDL_MapRGB(sdl_surface->format, + int(float(top.red) + redstep * y), + int(float(top.green) + greenstep * y), + int(float(top.blue) + bluestep * y))); + } } return sdl_surface; |
|
From: Ricardo C. <rm...@us...> - 2004-06-12 15:49:05
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6826/src Modified Files: background.cpp Log Message: Fixed the scrolling issue. Forgot that the DrawingContext used by gradient was global and so keep the translation point with the scrolling. Gradient caching should work just fine now. Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- background.cpp 10 Jun 2004 15:50:01 -0000 1.8 +++ background.cpp 12 Jun 2004 15:48:50 -0000 1.9 @@ -109,7 +109,12 @@ if(use_gl) context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0); else + { + context.push_transform(); + context.set_translation(Vector(0, 0)); context.draw_surface(image, Vector(0, 0), LAYER_BACKGROUND0); + context.pop_transform(); + } } else if(type == IMAGE) { int sx = int(-context.get_translation().x * speed) % image->w - image->w; |
|
From: Ricardo C. <rm...@us...> - 2004-06-12 15:42:36
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv324/src/screen Modified Files: texture.cpp Log Message: Passed color mask from screen SDL_Surface to the gradients cache one. This fixes the slowness. Still, there are problems when scrolling. This looks like some background issue, but dunno where. Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- texture.cpp 10 Jun 2004 14:09:49 -0000 1.5 +++ texture.cpp 12 Jun 2004 15:42:24 -0000 1.6 @@ -366,44 +366,29 @@ { SDL_Surface* sdl_surface; - Uint32 rmask, gmask, bmask, amask; - - /* SDL interprets each pixel as a 32-bit number, so our masks must depend - on the endianness (byte order) of the machine */ -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - rmask = 0xff000000; - gmask = 0x00ff0000; - bmask = 0x0000ff00; - amask = 0x000000ff; -#else - rmask = 0x000000ff; - gmask = 0x0000ff00; - bmask = 0x00ff0000; - amask = 0xff000000; -#endif - - sdl_surface = SDL_CreateRGBSurface(screen->flags, w, h, - screen->format->BitsPerPixel, rmask, gmask, bmask, amask); + sdl_surface = SDL_CreateRGBSurface(screen->flags, w, h, + screen->format->BitsPerPixel, screen->format->Rmask, + screen->format->Gmask, screen->format->Bmask, screen->format->Amask); - if(sdl_surface == NULL) - st_abort("Cannot create surface for the gradient", "SURFACE"); + if(sdl_surface == NULL) + st_abort("Cannot create surface for the gradient", "SURFACE"); - float redstep = (float(bottom.red)-float(top.red)) / float(h); - float greenstep = (float(bottom.green)-float(top.green)) / float(h); - float bluestep = (float(bottom.blue) - float(top.blue)) / float(h); + float redstep = (float(bottom.red)-float(top.red)) / float(h); + float greenstep = (float(bottom.green)-float(top.green)) / float(h); + float bluestep = (float(bottom.blue) - float(top.blue)) / float(h); - SDL_Rect rect; - rect.x = 0; - rect.w = w; - rect.h = 1; - for(float y = 0; y < h; y++) - { - rect.y = (int)y; - SDL_FillRect(sdl_surface, &rect, SDL_MapRGB(sdl_surface->format, - int(float(top.red) + redstep * y), - int(float(top.green) + greenstep * y), - int(float(top.blue) + bluestep * y))); - } + SDL_Rect rect; + rect.x = 0; + rect.w = w; + rect.h = 1; + for(float y = 0; y < h; y++) + { + rect.y = (int)y; + SDL_FillRect(sdl_surface, &rect, SDL_MapRGB(sdl_surface->format, + int(float(top.red) + redstep * y), + int(float(top.green) + greenstep * y), + int(float(top.blue) + bluestep * y))); + } return sdl_surface; } |
248 messages has been excluded from this view by a project administrator.
