Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 125635 Details for
Bug 186210
games-action/laadun-takaa-stadia-1.02 (new ebuild)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
games-action/laadun-takaa-stadia/files/fix.diff
fix.diff (text/plain), 14.90 KB, created by
Account removed
on 2007-07-22 11:42:51 UTC
(
hide
)
Description:
games-action/laadun-takaa-stadia/files/fix.diff
Filename:
MIME Type:
Creator:
Account removed
Created:
2007-07-22 11:42:51 UTC
Size:
14.90 KB
patch
obsolete
>diff -Naur lts-1.02/libfhi_scons.py lts-1.02-gentoo/libfhi_scons.py >--- lts-1.02/libfhi_scons.py 2007-01-27 01:37:37.000000000 +0100 >+++ lts-1.02-gentoo/libfhi_scons.py 2007-07-22 12:01:28.000000000 +0200 >@@ -927,7 +927,7 @@ > obligatory) > > # Find VHO API. >- # @param cmp Minimum version. >+ # @param cmp Minimum version.wx > # @param define If set, define this on success. > # @param obligatory If true, exit on error. > # @return True on success, false on error. >@@ -942,8 +942,8 @@ > # @param obligatory If true, exit on error. > # @return True on success, false on error. > def find_wxwidgets(self, cmp, define = '', obligatory = True): >- return self.find_compare('wx-config --version', >- 'wx-config --cflags --libs', 'wxWidgets', cmp, define, >+ return self.find_compare('wx-config-2.6 --version', >+ 'wx-config-2.6 --cflags --libs', 'wxWidgets', cmp, define, > obligatory) > > ############################################################################## >diff -Naur lts-1.02/src/main.cpp lts-1.02-gentoo/src/main.cpp >--- lts-1.02/src/main.cpp 2007-01-27 01:35:29.000000000 +0100 >+++ lts-1.02-gentoo/src/main.cpp 2007-07-22 12:11:51.000000000 +0200 >@@ -125,7 +125,7 @@ > wxStaticBoxSizer* launchbox = new wxStaticBoxSizer(wxVERTICAL, this, _T("LaunchPUI v1.00")); > wxStaticText* infoteksti = new wxStaticText(this, -1, _T("Another visitor! Stay a while.\nPlease enter your name to the field below to apply, any special needs can be set with the switches next to the field.\nThe default curriculum should be already loaded, but to create a custom curriculum, you can press the editor buttons at the top\nto open the curriculum editor. The curriculum must have at least 240 credits worth of courses to be launchable.\nThe sufficient credit total is indicated by Setaekamu launch button at the bottom of the screen. If the total is less than 240,\nthe button will be greyed out.\n\nSetaekamu wishes you good luck in your battle for credits and the quest for the ultimate elusive engineering degree!"), wxDefaultPosition, wxDefaultSize, 0, _T("staticText")); > wxBitmap bitmap; // a bitmap to hold the launch button "texture" >- bitmap.LoadFile(_T("gfx/launch.bmp"), wxBITMAP_TYPE_BMP); //loading the bitmap >+ bitmap.LoadFile(_T("/usr/share/games/laadun/gfx/launch.bmp"), wxBITMAP_TYPE_BMP); //loading the bitmap > //the buttons on the gui > LaunchGame = new wxBitmapButton(this, BUTTON_Launch, bitmap, wxDefaultPosition, wxSize(-1,-1)); > CopyBox = new wxButton(this, BUTTON_Copy, _T("Insert edited data into structure"), wxDefaultPosition, wxDefaultSize, 0); >@@ -278,7 +278,7 @@ > Layout(); > Save->Disable(); > Layout(); >- datafilename = _T("txt/default.cur"); //load default filename >+ datafilename = _T("/usr/share/games/laadun/txt/default.cur"); //load default filename > InitialLoadData(datafilename); //load the default curriculum > > FileMenu->Append(ID_MAINWIN_QUIT, _("&Quit")); >@@ -829,7 +829,7 @@ > glEnable(GL_COLOR_MATERIAL); > glMaterialfv(GL_FRONT,GL_SPECULAR,MaterialSpecular); > glMaterialfv(GL_FRONT,GL_EMISSION,MaterialEmission); >- GLuint loading_texture = load_texture("gfx/lording.png", 1); >+ GLuint loading_texture = load_texture("/usr/share/games/laadun/gfx/lording.png", 1); > > for(int del=0;del<5;del++) > { >@@ -866,19 +866,19 @@ > } > > //loading actual audio, maybe should be spread a bit, dunno >- bullet_sound = Mix_LoadWAV( "snd/bullet.wav" ); >- player_shoots_sound = Mix_LoadWAV( "snd/player_shoots.wav" ); >- enemy_gets_hit_sound = Mix_LoadWAV( "snd/enemy_gets_hit.wav" ); >- player_explodes_sound = Mix_LoadWAV( "snd/player_explodes.wav" ); >- alarm_sound = Mix_LoadWAV( "snd/alarm.wav" ); >- explosion_sound = Mix_LoadWAV( "snd/bomb.wav" ); >- game_over_sound = Mix_LoadWAV( "snd/game_over.wav" ); >- copypaste_overdrive_sound = Mix_LoadWAV( "snd/copypaste_overdrive.wav" ); >- overdrive_get_sound = Mix_LoadWAV( "snd/overdrive_get.wav" ); >- pause_game_sound = Mix_LoadWAV( "snd/pause_game.wav" ); >- select_sound = Mix_LoadWAV( "snd/select.wav" ); >- player_graze_sound = Mix_LoadWAV( "snd/player_graze.wav" ); >- time_runs_out_sound = Mix_LoadWAV( "snd/time_runs_out.wav" ); >+ bullet_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/bullet.wav" ); >+ player_shoots_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/player_shoots.wav" ); >+ enemy_gets_hit_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/enemy_gets_hit.wav" ); >+ player_explodes_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/player_explodes.wav" ); >+ alarm_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/alarm.wav" ); >+ explosion_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/bomb.wav" ); >+ game_over_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/game_over.wav" ); >+ copypaste_overdrive_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/copypaste_overdrive.wav" ); >+ overdrive_get_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/overdrive_get.wav" ); >+ pause_game_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/pause_game.wav" ); >+ select_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/select.wav" ); >+ player_graze_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/player_graze.wav" ); >+ time_runs_out_sound = Mix_LoadWAV( "/usr/share/games/laadun/snd/time_runs_out.wav" ); > //setting respective volumes for the sounds > Mix_VolumeChunk(bullet_sound,(int)(0.92*sound_vol_Box->GetValue())); > Mix_VolumeChunk(player_shoots_sound,(int)(0.3*sound_vol_Box->GetValue())); >@@ -1104,18 +1104,18 @@ > gluPerspective(45.0f,(GLfloat)res_x/(GLfloat)res_y,0.1f,100.0f); > glMatrixMode(GL_MODELVIEW); > //loading the textures >- GLuint cloud_texture = load_texture("gfx/cloud2.jpg", texture_filtering_option); >- GLuint line_texture = load_texture("gfx/line.png", texture_filtering_option); >- GLuint katto_texture = load_texture("gfx/katto.jpg", texture_filtering_option); >- GLuint overdrive1_texture = load_texture("gfx/overdrive1.png", texture_filtering_option); >- GLuint overdrive2_texture = load_texture("gfx/overdrive2.png", texture_filtering_option); >- GLuint overdrive3_texture = load_texture("gfx/overdrive3.png", texture_filtering_option); >- GLuint bar_texture = load_texture("gfx/stadiabar.png", texture_filtering_option); >- GLuint bullets_texture = load_texture("gfx/bullets.png", texture_filtering_option); >- GLuint bucket_texture = load_texture("gfx/bucket.png", texture_filtering_option); >+ GLuint cloud_texture = load_texture("/usr/share/games/laadun/gfx/cloud2.jpg", texture_filtering_option); >+ GLuint line_texture = load_texture("/usr/share/games/laadun/gfx/line.png", texture_filtering_option); >+ GLuint katto_texture = load_texture("/usr/share/games/laadun/gfx/katto.jpg", texture_filtering_option); >+ GLuint overdrive1_texture = load_texture("/usr/share/games/laadun/gfx/overdrive1.png", texture_filtering_option); >+ GLuint overdrive2_texture = load_texture("/usr/share/games/laadun/gfx/overdrive2.png", texture_filtering_option); >+ GLuint overdrive3_texture = load_texture("/usr/share/games/laadun/gfx/overdrive3.png", texture_filtering_option); >+ GLuint bar_texture = load_texture("/usr/share/games/laadun/gfx/stadiabar.png", texture_filtering_option); >+ GLuint bullets_texture = load_texture("/usr/share/games/laadun/gfx/bullets.png", texture_filtering_option); >+ GLuint bucket_texture = load_texture("/usr/share/games/laadun/gfx/bucket.png", texture_filtering_option); > //building fonts > Font tekstit; >- GLuint font_texture = load_texture("gfx/loosefont.png", texture_filtering_option); >+ GLuint font_texture = load_texture("/usr/share/games/laadun/gfx/loosefont.png", texture_filtering_option); > tekstit.BuildFont(font_texture, 24, res_x, res_y); > string timeleft="0"; //playtime left display > int year_counter=1; //game level/year >@@ -1651,7 +1651,7 @@ > vihu.setboss_mode(0); > year_counter=4; > glDeleteTextures(1, &cloud_texture); >- cloud_texture = load_texture("gfx/map.jpg", texture_filtering_option); >+ cloud_texture = load_texture("/usr/share/games/laadun/gfx/map.jpg", texture_filtering_option); > tausta.settexture(0,&cloud_texture); > tausta.settexture(1,&line_texture); > tausta.settexture(2,&katto_texture); >@@ -1825,13 +1825,13 @@ > if(boss_approaching_counter==10) > { > if(year_counter==1) >- music = Mix_LoadMUS( "snd/boss_1.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/boss_1.ogg" ); > if(year_counter==2) >- music = Mix_LoadMUS( "snd/boss_1.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/boss_1.ogg" ); > if(year_counter==3) >- music = Mix_LoadMUS( "snd/boss_1.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/boss_1.ogg" ); > if(year_counter==4) >- music = Mix_LoadMUS( "snd/boss_1.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/boss_1.ogg" ); > } > if(boss_approaching_counter==1) > { >@@ -1952,15 +1952,15 @@ > time_left+=365; > } > if(year_counter==1) >- music = Mix_LoadMUS( "snd/level_1.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/level_1.ogg" ); > else if(year_counter==2) >- music = Mix_LoadMUS( "snd/level_2.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/level_2.ogg" ); > else if(year_counter==3) >- music = Mix_LoadMUS( "snd/level_3.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/level_3.ogg" ); > else if(year_counter==4) >- music = Mix_LoadMUS( "snd/level_4.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/level_4.ogg" ); > else if(year_counter==5) >- music = Mix_LoadMUS( "snd/final.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/final.ogg" ); > } > > if(entering_level==120) >@@ -2239,7 +2239,7 @@ > } > Mix_HaltMusic(); > Mix_FreeMusic(music); >- music = Mix_LoadMUS( "snd/ending.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/ending.ogg" ); > if( Mix_PlayingMusic() == 0 ) > { > Mix_PlayMusic( music, -1 ); >@@ -2261,10 +2261,10 @@ > score = "[ "+scorepadding+score+" ]"; > string playername = ""; > playername = (StudentNameField->GetValue()).mb_str(wxConvUTF8); >- GLuint ending_texture1 = load_texture("gfx/ending1.png", texture_filtering_option); >- GLuint ending_texture2 = load_texture("gfx/ending2.png", texture_filtering_option); >- GLuint ending_texture3 = load_texture("gfx/ending3.png", texture_filtering_option); >- GLuint ending_texture4 = load_texture("gfx/ending4.png", texture_filtering_option); >+ GLuint ending_texture1 = load_texture("/usr/share/games/laadun/gfx/ending1.png", texture_filtering_option); >+ GLuint ending_texture2 = load_texture("/usr/share/games/laadun/gfx/ending2.png", texture_filtering_option); >+ GLuint ending_texture3 = load_texture("/usr/share/games/laadun/gfx/ending3.png", texture_filtering_option); >+ GLuint ending_texture4 = load_texture("/usr/share/games/laadun/gfx/ending4.png", texture_filtering_option); > > for(float jep=0;jep<1800;jep+=0.4) > { >@@ -2617,7 +2617,7 @@ > int texture_filtering_option = 2; > texture_filtering_option = mipmapping_RadioBox->GetSelection(); > // glDisable(GL_FOG); >- music = Mix_LoadMUS( "snd/menumusic.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/menumusic.ogg" ); > Timer fps; > Timer fraps; > Timer updates; >@@ -2652,10 +2652,10 @@ > gluPerspective(45.0f,(GLfloat)res_x/(GLfloat)res_y,0.1f,100.0f); > glMatrixMode(GL_MODELVIEW); > >- GLuint stadia_textur=load_texture("gfx/stadialogo.png", texture_filtering_option); >- GLuint StartQuitTexture=load_texture("gfx/quitstart.png", texture_filtering_option); >- GLuint ArrowTexture=load_texture("gfx/arrow.png", texture_filtering_option); >- GLuint mfont_texture=load_texture("gfx/loosefont.png", texture_filtering_option); >+ GLuint stadia_textur=load_texture("/usr/share/games/laadun/gfx/stadialogo.png", texture_filtering_option); >+ GLuint StartQuitTexture=load_texture("/usr/share/games/laadun/gfx/quitstart.png", texture_filtering_option); >+ GLuint ArrowTexture=load_texture("/usr/share/games/laadun/gfx/arrow.png", texture_filtering_option); >+ GLuint mfont_texture=load_texture("/usr/share/games/laadun/gfx/loosefont.png", texture_filtering_option); > Font font; > font.BuildFont(mfont_texture, 24, res_x, res_y); > float modifier=0; >@@ -2676,7 +2676,7 @@ > //loading an "empty" texture, a silly workaround to getting a buffer > //texture for the transition > //really, really should not be done like this ;3 >- GLuint TransitionTexture=load_texture("gfx/empty.png", 1); >+ GLuint TransitionTexture=load_texture("/usr/share/games/laadun/gfx/empty.png", 1); > //entering the actual loop > for(modifier = 0; modifier<3.0f;) > { >@@ -3039,7 +3039,7 @@ > int texture_filtering_option = 2; > texture_filtering_option = mipmapping_RadioBox->GetSelection(); > // glDisable(GL_FOG); >- music = Mix_LoadMUS( "snd/menumusic.ogg" ); >+ music = Mix_LoadMUS( "/usr/share/games/laadun/snd/menumusic.ogg" ); > Timer fps; > Timer fraps; > Timer updates; >@@ -3074,10 +3074,10 @@ > gluPerspective(45.0f,(GLfloat)res_x/(GLfloat)res_y,0.1f,100.0f); > glMatrixMode(GL_MODELVIEW); > >- GLuint stadia_textur=load_texture("gfx/stadialogo.png", texture_filtering_option); >- GLuint StartQuitTexture=load_texture("gfx/quitstart.png", texture_filtering_option); >- GLuint ArrowTexture=load_texture("gfx/arrow.png", texture_filtering_option); >- GLuint mfont_texture=load_texture("gfx/loosefont.png", texture_filtering_option); >+ GLuint stadia_textur=load_texture("/usr/share/games/laadun/gfx/stadialogo.png", texture_filtering_option); >+ GLuint StartQuitTexture=load_texture("/usr/share/games/laadun/gfx/quitstart.png", texture_filtering_option); >+ GLuint ArrowTexture=load_texture("/usr/share/games/laadun/gfx/arrow.png", texture_filtering_option); >+ GLuint mfont_texture=load_texture("/usr/share/games/laadun/gfx/loosefont.png", texture_filtering_option); > Font font; > font.BuildFont(mfont_texture, 24, res_x, res_y); > float modifier=0;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=125635">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 186210
:
125634
|
125635
|
128907
|
128909
|
136392
|
136393
|
181640
