Thread: [Super-tux-commit] supertux/src background.cpp,1.10,1.11 button.cpp,1.36,1.37 high_scores.cpp,1.21,1
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit
|
From: Ricardo C. <rm...@us...> - 2004-07-10 14:23:08
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31744/src Modified Files: background.cpp button.cpp high_scores.cpp leveleditor.cpp mousecursor.cpp particlesystem.cpp resources.cpp setup.cpp sprite.cpp tile.cpp title.cpp worldmap.cpp Log Message: Replaced USE_ALPHA/IGNORE_ALPHA by booleans. Should have been done long ago. Index: particlesystem.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/particlesystem.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- particlesystem.cpp 9 Jun 2004 05:23:19 -0000 1.11 +++ particlesystem.cpp 10 Jul 2004 14:22:59 -0000 1.12 @@ -71,9 +71,9 @@ SnowParticleSystem::SnowParticleSystem() { - snowimages[0] = new Surface(datadir+"/images/shared/snow0.png", USE_ALPHA); - snowimages[1] = new Surface(datadir+"/images/shared/snow1.png", USE_ALPHA); - snowimages[2] = new Surface(datadir+"/images/shared/snow2.png", USE_ALPHA); + snowimages[0] = new Surface(datadir+"/images/shared/snow0.png", true); + snowimages[1] = new Surface(datadir+"/images/shared/snow1.png", true); + snowimages[2] = new Surface(datadir+"/images/shared/snow2.png", true); virtual_width = screen->w * 2; @@ -128,7 +128,7 @@ CloudParticleSystem::CloudParticleSystem() { - cloudimage = new Surface(datadir + "/images/shared/cloud.png", USE_ALPHA); + cloudimage = new Surface(datadir + "/images/shared/cloud.png", true); virtual_width = 2000.0; Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- worldmap.cpp 10 Jul 2004 14:07:04 -0000 1.94 +++ worldmap.cpp 10 Jul 2004 14:22:59 -0000 1.95 @@ -130,7 +130,7 @@ tile->sprite = new Surface( datadir + "/images/worldmap/" + filename, - USE_ALPHA); + true); if (id >= int(tiles.size())) tiles.resize(id+1); @@ -171,9 +171,9 @@ Tux::Tux(WorldMap* worldmap_) : worldmap(worldmap_) { - largetux_sprite = new Surface(datadir + "/images/worldmap/tux.png", USE_ALPHA); - firetux_sprite = new Surface(datadir + "/images/worldmap/firetux.png", USE_ALPHA); - smalltux_sprite = new Surface(datadir + "/images/worldmap/smalltux.png", USE_ALPHA); + largetux_sprite = new Surface(datadir + "/images/worldmap/tux.png", true); + firetux_sprite = new Surface(datadir + "/images/worldmap/firetux.png", true); + smalltux_sprite = new Surface(datadir + "/images/worldmap/smalltux.png", true); offset = 0; moving = false; @@ -357,9 +357,9 @@ start_x = 4; start_y = 5; - level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", USE_ALPHA); - leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", USE_ALPHA); - leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", USE_ALPHA); + level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", true); + leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", true); + leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", true); input_direction = D_NONE; enter_level = false; Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- sprite.cpp 9 Jun 2004 05:23:20 -0000 1.16 +++ sprite.cpp 10 Jul 2004 14:22:59 -0000 1.17 @@ -44,7 +44,7 @@ for(std::vector<std::string>::size_type i = 0; i < images.size(); ++i) { surfaces.push_back( - new Surface(datadir + "/images/" + images[i], USE_ALPHA)); + new Surface(datadir + "/images/" + images[i], true)); } frame_delay = 1000.0f/fps; Index: button.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- button.cpp 9 Jun 2004 05:23:19 -0000 1.36 +++ button.cpp 10 Jul 2004 14:22:59 -0000 1.37 @@ -88,11 +88,11 @@ if(mw != -1 || mh != -1) { - icon.push_back(new Surface(filename,USE_ALPHA)); + icon.push_back(new Surface(filename,true)); icon.back()->resize(mw,mh); } else - icon.push_back(new Surface(filename,USE_ALPHA)); + icon.push_back(new Surface(filename,true)); } Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- setup.cpp 9 Jul 2004 14:43:44 -0000 1.107 +++ setup.cpp 10 Jul 2004 14:22:59 -0000 1.108 @@ -602,11 +602,11 @@ Font::NUM, 32,32); /* Load GUI/menu images: */ - checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA); - checkbox_checked = new Surface(datadir + "/images/status/checkbox-checked.png", USE_ALPHA); - back = new Surface(datadir + "/images/status/back.png", USE_ALPHA); - arrow_left = new Surface(datadir + "/images/icons/left.png", USE_ALPHA); - arrow_right = new Surface(datadir + "/images/icons/right.png", USE_ALPHA); + checkbox = new Surface(datadir + "/images/status/checkbox.png", true); + checkbox_checked = new Surface(datadir + "/images/status/checkbox-checked.png", true); + back = new Surface(datadir + "/images/status/back.png", true); + arrow_left = new Surface(datadir + "/images/icons/left.png", true); + arrow_right = new Surface(datadir + "/images/icons/right.png", true); /* Load the mouse-cursor */ mouse_cursor = new MouseCursor( datadir + "/images/status/mousecursor.png",1); Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.140 retrieving revision 1.141 diff -u -d -r1.140 -r1.141 --- leveleditor.cpp 16 Jun 2004 00:40:42 -0000 1.140 +++ leveleditor.cpp 10 Jul 2004 14:22:59 -0000 1.141 @@ -97,7 +97,7 @@ le_mouse_clicked[LEFT] = false; le_mouse_clicked[RIGHT] = false; - le_selection = new Surface(datadir + "/images/leveleditor/select.png", USE_ALPHA); + le_selection = new Surface(datadir + "/images/leveleditor/select.png", true); select_tilegroup_menu_effect.init(false); select_objects_menu_effect.init(false); Index: mousecursor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/mousecursor.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- mousecursor.cpp 29 Jun 2004 17:47:36 -0000 1.12 +++ mousecursor.cpp 10 Jul 2004 14:22:59 -0000 1.13 @@ -24,7 +24,7 @@ MouseCursor::MouseCursor(std::string cursor_file, int frames) : mid_x(0), mid_y(0) { - cursor = new Surface(cursor_file, USE_ALPHA); + cursor = new Surface(cursor_file, true); cur_state = MC_NORMAL; cur_frame = 0; Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- title.cpp 10 Jul 2004 14:07:03 -0000 1.104 +++ title.cpp 10 Jul 2004 14:22:59 -0000 1.105 @@ -247,9 +247,9 @@ titlesession = new GameSession(datadir + "/levels/misc/menu.stl", ST_GL_DEMO_GAME); /* Load images: */ - bkg_title = new Surface(datadir + "/images/background/arctis.jpg", IGNORE_ALPHA); - logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA); - img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA); + bkg_title = new Surface(datadir + "/images/background/arctis.jpg", false); + logo = new Surface(datadir + "/images/title/logo.png", true); + img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true); /* Generating contrib maps by only using a string_list */ worldmap_list = dfiles("levels/worldmap", NULL, NULL); Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- background.cpp 13 Jun 2004 21:48:16 -0000 1.10 +++ background.cpp 10 Jul 2004 14:22:59 -0000 1.11 @@ -86,7 +86,7 @@ this->speed = speed; delete image; - image = new Surface(datadir + "/images/background/" + name, IGNORE_ALPHA); + image = new Surface(datadir + "/images/background/" + name, false); } void Index: high_scores.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/high_scores.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- high_scores.cpp 14 Jun 2004 22:45:23 -0000 1.21 +++ high_scores.cpp 10 Jul 2004 14:22:59 -0000 1.22 @@ -86,7 +86,7 @@ SDL_Event event; DrawingContext context; - bkgd = new Surface(datadir + "/images/highscore/highscore.png", IGNORE_ALPHA); + bkgd = new Surface(datadir + "/images/highscore/highscore.png", false); hs_score = score; Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- tile.cpp 22 Jun 2004 12:34:14 -0000 1.32 +++ tile.cpp 10 Jul 2004 14:22:59 -0000 1.33 @@ -39,7 +39,7 @@ if (lisp_string_p(cur)) { return new Surface(datadir + "/images/tilesets/" + lisp_string(cur), - USE_ALPHA); + true); } else if (lisp_cons_p(cur) && lisp_symbol_p(lisp_car(cur))) { @@ -55,7 +55,7 @@ lisp_integer(lisp_list_nth(data, 2)), lisp_integer(lisp_list_nth(data, 3)), lisp_integer(lisp_list_nth(data, 4)), - USE_ALPHA); + true); } else { Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- resources.cpp 20 Jun 2004 14:50:21 -0000 1.40 +++ resources.cpp 10 Jul 2004 14:22:59 -0000 1.41 @@ -131,59 +131,59 @@ /* Water: */ - img_water = new Surface(datadir + "/images/shared/water.png", IGNORE_ALPHA); + img_water = new Surface(datadir + "/images/shared/water.png", false); img_waves[0] = new Surface(datadir + "/images/shared/waves-0.png", - USE_ALPHA); + true); img_waves[1] = new Surface(datadir + "/images/shared/waves-1.png", - USE_ALPHA); + true); img_waves[2] = new Surface(datadir + "/images/shared/waves-2.png", - USE_ALPHA); + true); /* Pole: */ - img_pole = new Surface(datadir + "/images/shared/pole.png", USE_ALPHA); + img_pole = new Surface(datadir + "/images/shared/pole.png", true); img_poletop = new Surface(datadir + "/images/shared/poletop.png", - USE_ALPHA); + true); /* Flag: */ img_flag[0] = new Surface(datadir + "/images/shared/flag-0.png", - USE_ALPHA); + true); img_flag[1] = new Surface(datadir + "/images/shared/flag-1.png", - USE_ALPHA); + true); /* Cloud: */ img_cloud[0][0] = new Surface(datadir + "/images/shared/cloud-00.png", - USE_ALPHA); + true); img_cloud[0][1] = new Surface(datadir + "/images/shared/cloud-01.png", - USE_ALPHA); + true); img_cloud[0][2] = new Surface(datadir + "/images/shared/cloud-02.png", - USE_ALPHA); + true); img_cloud[0][3] = new Surface(datadir + "/images/shared/cloud-03.png", - USE_ALPHA); + true); img_cloud[1][0] = new Surface(datadir + "/images/shared/cloud-10.png", - USE_ALPHA); + true); img_cloud[1][1] = new Surface(datadir + "/images/shared/cloud-11.png", - USE_ALPHA); + true); img_cloud[1][2] = new Surface(datadir + "/images/shared/cloud-12.png", - USE_ALPHA); + true); img_cloud[1][3] = new Surface(datadir + "/images/shared/cloud-13.png", - USE_ALPHA); + true); /* Bad guys: */ @@ -205,22 +205,22 @@ /* Distros: */ img_distro[0] = new Surface(datadir + "/images/tilesets/coin1.png", - USE_ALPHA); + true); img_distro[1] = new Surface(datadir + "/images/tilesets/coin2.png", - USE_ALPHA); + true); img_distro[2] = new Surface(datadir + "/images/tilesets/coin3.png", - USE_ALPHA); + true); img_distro[3] = new Surface(datadir + "/images/tilesets/coin2.png", - USE_ALPHA); + true); /* Tux life: */ tux_life = new Surface(datadir + "/images/shared/tux-life.png", - USE_ALPHA); + true); /* Sound effects: */ |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X