diff --git a/Game/gfx/BackBoard.png b/Game/gfx/BackBoard.png index ca41da8..1043816 100755 Binary files a/Game/gfx/BackBoard.png and b/Game/gfx/BackBoard.png differ diff --git a/Game/gfx/bConfigure.png b/Game/gfx/bConfigure.png index bc2602c..2d69ab9 100755 Binary files a/Game/gfx/bConfigure.png and b/Game/gfx/bConfigure.png differ diff --git a/Game/gfx/bConnect.png b/Game/gfx/bConnect.png index 3ffe36c..2e11b93 100755 Binary files a/Game/gfx/bConnect.png and b/Game/gfx/bConnect.png differ diff --git a/Game/gfx/bEndless.png b/Game/gfx/bEndless.png index 395068b..2bde2db 100755 Binary files a/Game/gfx/bEndless.png and b/Game/gfx/bEndless.png differ diff --git a/Game/gfx/bExit.png b/Game/gfx/bExit.png index d63752f..d22bfe3 100755 Binary files a/Game/gfx/bExit.png and b/Game/gfx/bExit.png differ diff --git a/Game/gfx/bHighScore.png b/Game/gfx/bHighScore.png index be3a202..028611a 100755 Binary files a/Game/gfx/bHighScore.png and b/Game/gfx/bHighScore.png differ diff --git a/Game/gfx/bHost.png b/Game/gfx/bHost.png index 41b89f7..e68036c 100755 Binary files a/Game/gfx/bHost.png and b/Game/gfx/bHost.png differ diff --git a/Game/gfx/bLoad.png b/Game/gfx/bLoad.png index a91f916..86f4bb9 100755 Binary files a/Game/gfx/bLoad.png and b/Game/gfx/bLoad.png differ diff --git a/Game/gfx/bNetwork.png b/Game/gfx/bNetwork.png index 9bf8e8e..8f7723f 100755 Binary files a/Game/gfx/bNetwork.png and b/Game/gfx/bNetwork.png differ diff --git a/Game/gfx/bNewGame.png b/Game/gfx/bNewGame.png index b7e0588..b6e3a40 100755 Binary files a/Game/gfx/bNewGame.png and b/Game/gfx/bNewGame.png differ diff --git a/Game/gfx/background.png b/Game/gfx/background.png index 18992c4..9d48c07 100755 Binary files a/Game/gfx/background.png and b/Game/gfx/background.png differ diff --git a/Game/gfx/balls/ballBlue.png b/Game/gfx/balls/ballBlue.png index 22e30f8..b499d88 100755 Binary files a/Game/gfx/balls/ballBlue.png and b/Game/gfx/balls/ballBlue.png differ diff --git a/Game/gfx/balls/ballGray.png b/Game/gfx/balls/ballGray.png index 89d2ca6..b5cb6c1 100755 Binary files a/Game/gfx/balls/ballGray.png and b/Game/gfx/balls/ballGray.png differ diff --git a/Game/gfx/balls/ballGreen.png b/Game/gfx/balls/ballGreen.png index b5dba0c..329873a 100755 Binary files a/Game/gfx/balls/ballGreen.png and b/Game/gfx/balls/ballGreen.png differ diff --git a/Game/gfx/balls/ballPurple.png b/Game/gfx/balls/ballPurple.png index 7b4d0b1..fb20f6a 100755 Binary files a/Game/gfx/balls/ballPurple.png and b/Game/gfx/balls/ballPurple.png differ diff --git a/Game/gfx/balls/ballRed.png b/Game/gfx/balls/ballRed.png index 2729ff6..4451b21 100755 Binary files a/Game/gfx/balls/ballRed.png and b/Game/gfx/balls/ballRed.png differ diff --git a/Game/gfx/balls/ballTurkish.png b/Game/gfx/balls/ballTurkish.png index fd56426..60fb0bf 100755 Binary files a/Game/gfx/balls/ballTurkish.png and b/Game/gfx/balls/ballTurkish.png differ diff --git a/Game/gfx/balls/ballYellow.png b/Game/gfx/balls/ballYellow.png index 6fdaf69..7f4720e 100755 Binary files a/Game/gfx/balls/ballYellow.png and b/Game/gfx/balls/ballYellow.png differ diff --git a/Game/gfx/boardBackBack.png b/Game/gfx/boardBackBack.png index 1fbf0a4..e2beff4 100755 Binary files a/Game/gfx/boardBackBack.png and b/Game/gfx/boardBackBack.png differ diff --git a/Game/gfx/bricks/blue.png b/Game/gfx/bricks/blue.png new file mode 100755 index 0000000..a6520c9 Binary files /dev/null and b/Game/gfx/bricks/blue.png differ diff --git a/Game/gfx/bricks/green.png b/Game/gfx/bricks/green.png new file mode 100755 index 0000000..79b604a Binary files /dev/null and b/Game/gfx/bricks/green.png differ diff --git a/Game/gfx/bricks/grey.png b/Game/gfx/bricks/grey.png new file mode 100755 index 0000000..91451d7 Binary files /dev/null and b/Game/gfx/bricks/grey.png differ diff --git a/Game/gfx/bricks/purple.png b/Game/gfx/bricks/purple.png new file mode 100755 index 0000000..c6c1c87 Binary files /dev/null and b/Game/gfx/bricks/purple.png differ diff --git a/Game/gfx/bricks/red.png b/Game/gfx/bricks/red.png new file mode 100755 index 0000000..c8359bf Binary files /dev/null and b/Game/gfx/bricks/red.png differ diff --git a/Game/gfx/bricks/turkish.png b/Game/gfx/bricks/turkish.png new file mode 100755 index 0000000..f59e812 Binary files /dev/null and b/Game/gfx/bricks/turkish.png differ diff --git a/Game/gfx/bricks/yellow.png b/Game/gfx/bricks/yellow.png new file mode 100755 index 0000000..524ac66 Binary files /dev/null and b/Game/gfx/bricks/yellow.png differ diff --git a/Game/gfx/garbage/garbageB.png b/Game/gfx/garbage/garbageB.png index 044a82f..e050fd4 100755 Binary files a/Game/gfx/garbage/garbageB.png and b/Game/gfx/garbage/garbageB.png differ diff --git a/Game/gfx/garbage/garbageBL.png b/Game/gfx/garbage/garbageBL.png index 016e002..4710dc9 100755 Binary files a/Game/gfx/garbage/garbageBL.png and b/Game/gfx/garbage/garbageBL.png differ diff --git a/Game/gfx/garbage/garbageBR.png b/Game/gfx/garbage/garbageBR.png index c3a1e9a..6e736f6 100755 Binary files a/Game/gfx/garbage/garbageBR.png and b/Game/gfx/garbage/garbageBR.png differ diff --git a/Game/gfx/garbage/garbageFill.png b/Game/gfx/garbage/garbageFill.png index a6b620c..8882022 100755 Binary files a/Game/gfx/garbage/garbageFill.png and b/Game/gfx/garbage/garbageFill.png differ diff --git a/Game/gfx/garbage/garbageGM.png b/Game/gfx/garbage/garbageGM.png index 0010223..03d737c 100755 Binary files a/Game/gfx/garbage/garbageGM.png and b/Game/gfx/garbage/garbageGM.png differ diff --git a/Game/gfx/garbage/garbageGML.png b/Game/gfx/garbage/garbageGML.png index e770e0d..596cf2a 100755 Binary files a/Game/gfx/garbage/garbageGML.png and b/Game/gfx/garbage/garbageGML.png differ diff --git a/Game/gfx/garbage/garbageGMR.png b/Game/gfx/garbage/garbageGMR.png index d757977..aed2c55 100755 Binary files a/Game/gfx/garbage/garbageGMR.png and b/Game/gfx/garbage/garbageGMR.png differ diff --git a/Game/gfx/garbage/garbageL.png b/Game/gfx/garbage/garbageL.png index 7e9f612..830e44c 100755 Binary files a/Game/gfx/garbage/garbageL.png and b/Game/gfx/garbage/garbageL.png differ diff --git a/Game/gfx/garbage/garbageM.png b/Game/gfx/garbage/garbageM.png index 572e0a9..918affd 100755 Binary files a/Game/gfx/garbage/garbageM.png and b/Game/gfx/garbage/garbageM.png differ diff --git a/Game/gfx/garbage/garbageML.png b/Game/gfx/garbage/garbageML.png index 0957d4a..0a97f62 100755 Binary files a/Game/gfx/garbage/garbageML.png and b/Game/gfx/garbage/garbageML.png differ diff --git a/Game/gfx/garbage/garbageMR.png b/Game/gfx/garbage/garbageMR.png index 9a5afc5..6707ecd 100755 Binary files a/Game/gfx/garbage/garbageMR.png and b/Game/gfx/garbage/garbageMR.png differ diff --git a/Game/gfx/garbage/garbageR.png b/Game/gfx/garbage/garbageR.png index 86df52d..30958b3 100755 Binary files a/Game/gfx/garbage/garbageR.png and b/Game/gfx/garbage/garbageR.png differ diff --git a/Game/gfx/garbage/garbageT.png b/Game/gfx/garbage/garbageT.png index c908a47..13e2f1c 100755 Binary files a/Game/gfx/garbage/garbageT.png and b/Game/gfx/garbage/garbageT.png differ diff --git a/Game/gfx/garbage/garbageTL.png b/Game/gfx/garbage/garbageTL.png index 9e801c8..cbd8e4e 100755 Binary files a/Game/gfx/garbage/garbageTL.png and b/Game/gfx/garbage/garbageTL.png differ diff --git a/Game/gfx/garbage/garbageTR.png b/Game/gfx/garbage/garbageTR.png index 423843f..e0ed203 100755 Binary files a/Game/gfx/garbage/garbageTR.png and b/Game/gfx/garbage/garbageTR.png differ diff --git a/source/AUTH b/source/AUTH index df494a9..7cc584c 100644 --- a/source/AUTH +++ b/source/AUTH @@ -2,72 +2,74 @@ To ensure that all authers for each medie file. Only files that cannot include a /gfx/ 14P_Arial_Angle_Red.png Karl Bartel - http://user.cs.tu-berlin.de/~karlb/sfont/fonts.html -bConnect.png Poul Sander -blockAttack.ico Poul Sander +b1024.png Poul Sander +bBack.png Poul Sander +bChange.png Poul Sander +bConnect.png qubodup +bConfigure.png qubodup +bEndless.png qubodup +bExit.png qubodup +bForward.png Poul Sander +bHighScore.png qubodup +bHost.png qubodup +bHowToPlay.png Poul Sander +bInternet.png Poul Sander +bLoad.png qubodup +bNetwork.png qubodup +bNewGame.png qubodup +bNext.png Poul Sander +bOff.png Poul Sander +bOn.png Poul Sander +bOnePlayer.png Poul Sander +bOptions.png Poul Sander +bPuzzle.png Poul Sander bReplays.png Poul Sander +bRetry.png Poul Sander +bSave.png Poul Sander +bSelectPuzzle.png Poul Sander +bSkip.png Poul Sander +bTheme.png Poul Sander +bTimeTrial.png Poul Sander +bVsGame.png Poul Sander +bStageClear.png Poul Sander +bTwoPlayers.png Poul Sander + +blockAttack.ico Poul Sander changeButtonsBack1.png Poul Sander iDraw.png Poul Sander SmallStone.png Karl Bartel - http://user.cs.tu-berlin.de/~karlb/sfont/fonts.html 24P_Arial_Blue.png Karl Bartel - http://user.cs.tu-berlin.de/~karlb/sfont/fonts.html -bEndless.png Poul Sander -blue.png Poul Sander -bRetry.png Poul Sander changeButtonsBack.png Poul Sander iGameOver.png Poul Sander -bExit.png Poul Sander -bNetwork.png Poul Sander -bSave.png Poul Sander iLevelCheckBox.png Poul Sander topscores.png Poul Sander -b1024.png Poul Sander -bForward.png Poul Sander -bNewGame.png Poul Sander -bSelectPuzzle.png Poul Sander crossover.png Poul Sander iLevelCheck.png Poul Sander transCover.png Poul Sander -BackBoard.png Poul Sander -bHighScore.png Poul Sander -bNext.png Poul Sander -bSkip.png Poul Sander +BackBoard.png qubodup dialogbox.png Poul Sander iLoser.png Poul Sander -turkish.png Poul Sander -background1.png Poul Sander -bHost.png Poul Sander -boardBackBack.png Poul Sander -bStageClear.png Poul Sander +boardBackBack.png qubodup fileDialogbox.png Poul Sander iStageClearLimit.png Poul Sander -yellow.png Poul Sander -background.png Poul Sander -bHowToPlay.png Poul Sander -bOff.png Poul Sander -bTheme.png Poul Sander +background.png qubodup iWinner.png Poul Sander -bInternet.png Poul Sander -bOnePlayer.png Poul Sander -bTimeTrial.png Poul Sander -green.png Poul Sander mouse.png Poul Sander -bBack.png Poul Sander blackBackGround.png Poul Sander -bOn.png Poul Sander -bTwoPlayers.png Poul Sander -grey.png Poul Sander options.png Poul Sander -bChange.png Poul Sander blackLine.png Poul Sander -bOptions.png Poul Sander -bVsGame.png Poul Sander iCheckBoxArea.png Poul Sander -purple.png Poul Sander -bConfigure.png Poul Sander -bLoad.png Poul Sander -bPuzzle.png Poul Sander chainFrame.png Poul Sander icon.png Poul Sander -red.png Poul Sander + +/gfx/bricks/ +blue.png qubodup +green.png qubodup +grey.png qubodup +purple.png qubodup +red.png qubodup +turkish.png qubodup +yellow.png qubodup /gfx/smileys/ 0.png Poul Sander @@ -99,30 +101,30 @@ ready_2.png Poul Sander 3.png Poul Sander /gfx/garbage/ -garbageBL.png Poul Sander -garbageBR.png Poul Sander -garbageGML.png Poul Sander -garbageGMR.png Poul Sander -garbageML.png Poul Sander -garbageMR.png Poul Sander -garbageTL.png Poul Sander -garbageTR.png Poul Sander -garbageB.png Poul Sander -garbageFill.png Poul Sander -garbageGM.png Poul Sander -garbageL.png Poul Sander -garbageM.png Poul Sander -garbageR.png Poul Sander -garbageT.png Poul Sander +garbageBL.png qubodup +garbageBR.png qubodup +garbageGML.png qubodup +garbageGMR.png qubodup +garbageML.png qubodup +garbageMR.png qubodup +garbageTL.png qubodup +garbageTR.png qubodup +garbageB.png qubodup +garbageFill.png qubodup +garbageGM.png qubodup +garbageL.png qubodup +garbageM.png qubodup +garbageR.png qubodup +garbageT.png qubodup /gfx/balls/ -ballBlue.png Poul Sander -ballGray.png Poul Sander -ballGreen.png Poul Sander -ballPurple.png Poul Sander -ballRed.png Poul Sander -ballTurkish.png Poul Sander -ballYellow.png Poul Sander +ballBlue.png qubodup +ballGray.png qubodup +ballGreen.png qubodup +ballPurple.png qubodup +ballRed.png qubodup +ballTurkish.png qubodup +ballYellow.png qubodup /sound/ pop.ogg openarena-svn887:/sound/weapons/rocket/rockf1a.wav diff --git a/source/assets/gfx/balls/blue.svg b/source/assets/gfx/balls/blue.svg new file mode 100644 index 0000000..137a569 --- /dev/null +++ b/source/assets/gfx/balls/blue.svg @@ -0,0 +1,93 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/source/assets/gfx/balls/green.svg b/source/assets/gfx/balls/green.svg new file mode 100644 index 0000000..88ff307 --- /dev/null +++ b/source/assets/gfx/balls/green.svg @@ -0,0 +1,75 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/source/assets/gfx/balls/grey.svg b/source/assets/gfx/balls/grey.svg new file mode 100644 index 0000000..2a81157 --- /dev/null +++ b/source/assets/gfx/balls/grey.svg @@ -0,0 +1,166 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/assets/gfx/balls/purple.svg b/source/assets/gfx/balls/purple.svg new file mode 100644 index 0000000..5ae851f --- /dev/null +++ b/source/assets/gfx/balls/purple.svg @@ -0,0 +1,121 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/source/assets/gfx/balls/red.svg b/source/assets/gfx/balls/red.svg new file mode 100644 index 0000000..358bc4a --- /dev/null +++ b/source/assets/gfx/balls/red.svg @@ -0,0 +1,94 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/source/assets/gfx/balls/turkish.svg b/source/assets/gfx/balls/turkish.svg new file mode 100644 index 0000000..ab23e55 --- /dev/null +++ b/source/assets/gfx/balls/turkish.svg @@ -0,0 +1,103 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/source/assets/gfx/balls/yellow.svg b/source/assets/gfx/balls/yellow.svg new file mode 100644 index 0000000..8a2a0b1 --- /dev/null +++ b/source/assets/gfx/balls/yellow.svg @@ -0,0 +1,107 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/source/assets/gfx/buttons.svg b/source/assets/gfx/buttons.svg new file mode 100644 index 0000000..396996b --- /dev/null +++ b/source/assets/gfx/buttons.svg @@ -0,0 +1,6394 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Options + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Play + Alone + Together + Network + Scores + Time Trial + Endless + + + + + + + + + + + Stage Clear + Puzzle + Versus + + Host + Connect + + + + + + + + + + Replays + Save + Load + + + + + + + + + + + Puzzle File + Configure + diff --git a/source/code/block.make b/source/code/block.make index dc1296b..0afa978 100644 --- a/source/code/block.make +++ b/source/code/block.make @@ -13,8 +13,14 @@ ifndef NETWORK NETWORK=1 endif +ifndef USE_ABSTRACT_FS +USE_ABSTRACT_FS=1 +endif + ifeq ($(DEBUG),1) BASE_CFLAGS += -g -DDEBUG=1 +else +BASE_CFLAGS += -O4 endif ifeq ($(NETWORK),1) @@ -24,6 +30,13 @@ else BASE_CFLAGS += -DNETWORK=0 endif +ifeq ($(USE_ABSTRACT_FS),1) +BASE_CFLAGS += -DUSE_ABSTRACT_FS=1 +BASE_LIBS += -lphysfs +else +BASE_CFLAGS += -DUSE_ABSTRACT_FS=0 +endif + $(BINARY): main.o highscore.o SFont.o ReadKeyboard.o joypad.o listFiles.o replay.o common.o stats.o uploadReplay.o $(CPP) -O -o $(BINARY) main.o highscore.o SFont.o ReadKeyboard.o joypad.o listFiles.o replay.o common.o stats.o $(BASE_LIBS) #-lphysfs diff --git a/source/code/main.cpp b/source/code/main.cpp index 4deb7ce..e505621 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp @@ -42,7 +42,7 @@ Copyright (C) 2008 Poul Sander #endif #ifndef USE_ABSTRACT_FS - #define USE_ABSTRACT_FS 0 + #define USE_ABSTRACT_FS 1 #endif //Build-in level editor is still experimental! @@ -264,13 +264,13 @@ void loadTheme(string themeName) reloadIMG(&explosion[i],themeName+"/animations/explosion/"+(char)('0'+i)+".png"); CONVERTA(explosion[i]); } - reloadIMG(&bricks[0],themeName+"/blue.png"); - reloadIMG(&bricks[1],themeName+"/green.png"); - reloadIMG(&bricks[2],themeName+"/purple.png"); - reloadIMG(&bricks[3],themeName+"/red.png"); - reloadIMG(&bricks[4],themeName+"/turkish.png"); - reloadIMG(&bricks[5],themeName+"/yellow.png"); - reloadIMG(&bricks[6],themeName+"/gray.png"); + reloadIMG(&bricks[0],themeName+"/bricks/blue.png"); + reloadIMG(&bricks[1],themeName+"/bricks/green.png"); + reloadIMG(&bricks[2],themeName+"/bricks/purple.png"); + reloadIMG(&bricks[3],themeName+"/bricks/red.png"); + reloadIMG(&bricks[4],themeName+"/bricks/turkish.png"); + reloadIMG(&bricks[5],themeName+"/bricks/yellow.png"); + reloadIMG(&bricks[6],themeName+"/bricks/grey.png"); reloadIMG(&balls[0],themeName+"/balls/ballBlue.png"); reloadIMG(&balls[1],themeName+"/balls/ballGreen.png"); reloadIMG(&balls[2],themeName+"/balls/ballPurple.png"); @@ -462,13 +462,13 @@ int InitImages() #endif && (blackLine = IMG_Load2((char*)"gfx/blackLine.png")) && (stageBobble = IMG_Load2((char*)"gfx/iStageClearLimit.png")) - && (bricks[0] = IMG_Load2((char*)"gfx/blue.png")) - && (bricks[1] = IMG_Load2((char*)"gfx/green.png")) - && (bricks[2] = IMG_Load2((char*)"gfx/purple.png")) - && (bricks[3] = IMG_Load2((char*)"gfx/red.png")) - && (bricks[4] = IMG_Load2((char*)"gfx/turkish.png")) - && (bricks[5] = IMG_Load2((char*)"gfx/yellow.png")) - && (bricks[6] = IMG_Load2((char*)"gfx/grey.png")) + && (bricks[0] = IMG_Load2((char*)"gfx/bricks/blue.png")) + && (bricks[1] = IMG_Load2((char*)"gfx/bricks/green.png")) + && (bricks[2] = IMG_Load2((char*)"gfx/bricks/purple.png")) + && (bricks[3] = IMG_Load2((char*)"gfx/bricks/red.png")) + && (bricks[4] = IMG_Load2((char*)"gfx/bricks/turkish.png")) + && (bricks[5] = IMG_Load2((char*)"gfx/bricks/yellow.png")) + && (bricks[6] = IMG_Load2((char*)"gfx/bricks/grey.png")) && (crossover = IMG_Load2((char*)"gfx/crossover.png")) && (balls[0] = IMG_Load2((char*)"gfx/balls/ballBlue.png")) && (balls[1] = IMG_Load2((char*)"gfx/balls/ballGreen.png")) @@ -3202,7 +3202,7 @@ int main(int argc, char *argv[]) #if USE_ABSTRACT_FS //Init the file system abstraction layer PHYSFS_init(argv[0]); - PHYSFS_AddToSearchPath("blockattack.data", 1); + PHYSFS_addToSearchPath("blockattack.data", 1); #endif