Merge pull request #27 from WagicProject/master

getting master

projects/mtg/Android/AndroidManifest.xml

@@ -4,7 +4,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <application android:debuggable="true" android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+    <application android:debuggable="false" android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
         <activity android:configChanges="keyboard|keyboardHidden|orientation" android:label="@string/app_name" android:name="org.libsdl.app.SDLActivity" android:screenOrientation="sensorLandscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

projects/mtg/Android/jni/Android.mk

@@ -11,9 +11,8 @@ SDL_PATH := $(JGE_PATH)/Dependencies/SDL
 BOOST_PATH := $(MY_WAGIC_ROOT)/Boost
 JPEG_PATH := $(JGE_PATH)/Dependencies/libjpeg
 PNG_PATH := $(JGE_PATH)/Dependencies/libpng
-DEBUG ?= DEBUG
 
-LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -D_$(DEBUG)
+LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG
 LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC -DTIXML_USE_STL
 LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS
 LOCAL_STATIC_LIBRARIES := libpng libjpeg

projects/mtg/src/Credits.cpp

@@ -505,12 +505,14 @@ void Credits::Render()
     if (!p1)
         return;
     JRenderer * r = JRenderer::GetInstance();
+#if !defined (PSP)
     JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("bgdeckeditor.jpg");
     if (wpTex)
     {
         JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("bgdeckeditor.jpg");
-        JRenderer::GetInstance()->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
+        r->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
     }
+#endif
     WFont * f = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
     WFont * f2 = WResourceManager::Instance()->GetWFont(Fonts::MENU_FONT);
     WFont * f3 = WResourceManager::Instance()->GetWFont(Fonts::MAGIC_FONT);

projects/mtg/src/DeckMenu.cpp

@@ -150,6 +150,10 @@ void DeckMenu::RenderBackground()
     else
         bgFilename << backgroundName << ".png";
 
+#if defined (PSP)
+    bgFilename << "psppspdeckmenu.png";
+#endif
+
     static bool loadBackground = true;
     if (loadBackground)
     {
@@ -263,13 +267,20 @@ void DeckMenu::Render()
         timeOpen = 0;
         menuInitialized = true;
     }
+#if !defined (PSP)
     if (avatarholder.get() && menupanel.get() && inDeckMenu)//bg panel
          renderer->RenderQuad(menupanel.get(), 225.f, 0, 0 ,SCREEN_WIDTH_F / avatarholder.get()->mWidth, SCREEN_HEIGHT_F / avatarholder.get()->mHeight);
+
     RenderBackground();//background deck menu
     mScroller->Render();
+#else
+    mScroller->Render();
+    RenderBackground();//background deck menu
+#endif
+#if !defined (PSP)
     if (menuholder.get() && inDeckMenu)//menuholder
          renderer->RenderQuad(menuholder.get(), 0, 0, 0 ,SCREEN_WIDTH_F / menuholder.get()->mWidth, SCREEN_HEIGHT_F / menuholder.get()->mHeight);
-
+#endif
     if (timeOpen < 1) height *= timeOpen > 0 ? timeOpen : -timeOpen;
     
     for (int i = startId; i < startId + maxItems; i++)
@@ -313,16 +324,20 @@ void DeckMenu::Render()
                         {
                             JQuad * evil = quad.get();
                             evil->SetHFlip(true);
+#if !defined (PSP)
                             if (avatarholder.get() && inDeckMenu)
                                 renderer->RenderQuad(avatarholder.get(), 0, 0, 0 ,SCREEN_WIDTH_F / avatarholder.get()->mWidth, SCREEN_HEIGHT_F / avatarholder.get()->mHeight);
+#endif
                             renderer->RenderQuad(quad.get(), avatarX+modAvatarX, avatarY+modAvatarY, 0, xscale, yscale);
                             renderer->DrawRect(avatarX+modAvatarX, avatarY+modAvatarY,37.f,50.f,ARGB(200,3,3,3));
                             evil = NULL;
                         }
                         else
                         {
+#if !defined (PSP)
                             if (avatarholder.get() && inDeckMenu)
                                 renderer->RenderQuad(avatarholder.get(), 0, 0, 0 ,SCREEN_WIDTH_F / avatarholder.get()->mWidth, SCREEN_HEIGHT_F / avatarholder.get()->mHeight);
+#endif
                             renderer->RenderQuad(quad.get(), avatarX+modAvatarX, avatarY+modAvatarY, 0, xscale, yscale);
                             renderer->DrawRect(avatarX+modAvatarX, avatarY+modAvatarY,37.f,50.f,ARGB(200,3,3,3));
                         }

projects/mtg/src/GameApp.cpp

@@ -231,8 +231,12 @@ void GameApp::Create()
     //WResourceManager::Instance()->RetrieveTexture("wood.png", RETRIEVE_MANAGE);
     //WResourceManager::Instance()->RetrieveTexture("gold.png", RETRIEVE_MANAGE);
     //WResourceManager::Instance()->RetrieveTexture("goldglow.png", RETRIEVE_MANAGE);
+#if !defined (PSP)
     WResourceManager::Instance()->RetrieveTexture("backdrop.jpg", RETRIEVE_MANAGE);
     WResourceManager::Instance()->RetrieveTexture("backdropframe.png", RETRIEVE_MANAGE);
+#else
+    WResourceManager::Instance()->RetrieveTexture("pspbackdrop.jpg", RETRIEVE_MANAGE);
+#endif
     WResourceManager::Instance()->RetrieveTexture("handback.png", RETRIEVE_MANAGE);
     WResourceManager::Instance()->RetrieveTexture("shadows.png", RETRIEVE_MANAGE);
 

projects/mtg/src/GameStateDeckViewer.cpp

@@ -1285,6 +1285,7 @@ void GameStateDeckViewer::Render()
     setButtonState(false);
     WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
     JRenderer::GetInstance()->ClearScreen(ARGB(0,0,0,0));
+#if !defined (PSP)
     JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("bgdeckeditor.jpg");
     if (wpTex)
     {
@@ -1293,7 +1294,7 @@ void GameStateDeckViewer::Render()
     }/*
     if (mView->deck() == myDeck && mStage != STAGE_MENU)
         renderDeckBackground();*/
-
+#endif
     mView->Render();
 
     if (mView->deck()->Size() > 0)

projects/mtg/src/GameStateDuel.cpp

@@ -1037,12 +1037,14 @@ void GameStateDuel::Render()
     WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
     JRenderer * r = JRenderer::GetInstance();
     r->ClearScreen(ARGB(0,0,0,0));
+#if !defined (PSP)
     JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("bgdeckeditor.jpg");
     if (wpTex)
     {
         JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("bgdeckeditor.jpg");
         JRenderer::GetInstance()->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
     }
+#endif
     //render the game until someone did win the game (otherwise it crashes sometimes under linux)
     if (game && !game->didWin())
         game->Render();

projects/mtg/src/GameStateMenu.cpp

@@ -795,6 +795,7 @@ void GameStateMenu::Render()
             else
                 sprintf(text, "%s", _("LOADING...").c_str());
         }
+#if !defined (PSP)
         //tooltip & overlay
         JQuadPtr menubar;
         menubar = WResourceManager::Instance()->RetrieveTempQuad("menubar.png");//new graphics menubar
@@ -811,6 +812,7 @@ void GameStateMenu::Render()
             renderer->DrawRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(200, 204, 153, 0));
         //end
         }
+#endif
         mFont->SetColor(ARGB(170,0,0,0));
         mFont->DrawString(text, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 50 + 2, JGETEXT_CENTER);
         mFont->SetColor(ARGB(255,255,255,255));

projects/mtg/src/GameStateOptions.cpp

@@ -214,12 +214,14 @@ void GameStateOptions::Render()
 {
     //Erase
     JRenderer::GetInstance()->ClearScreen(ARGB(0,0,0,0));
+#if !defined (PSP)
     JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("bgdeckeditor.jpg");
     if (wpTex)
     {
         JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("bgdeckeditor.jpg");
         JRenderer::GetInstance()->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
     }
+#endif
     const char * const CreditsText[] = {
         "Wagic, The Homebrew?! by Wololo",
         "",

projects/mtg/src/GridDeckView.cpp

@@ -125,11 +125,17 @@ void GridDeckView::Render()
         {
             if (WResourceManager::Instance()->IsThreaded())
             {
-                //WResourceManager::Instance()->RetrieveCard(mCards[i].card, RETRIEVE_THUMB);
+#if !defined (PSP)
                 WResourceManager::Instance()->RetrieveCard(mCards[i].card, RETRIEVE_NORMAL);
+#else
+                WResourceManager::Instance()->RetrieveCard(mCards[i].card, RETRIEVE_THUMB);
+#endif
             }
-            //renderCard(i, 255, true);
+#if !defined (PSP)
             renderCard(i, 255, false);//for psp, use lowres images if you can.
+#else
+            renderCard(i, 255, true);
+#endif
         }
         else
         {

projects/mtg/src/GuiBackground.cpp

@@ -7,6 +7,7 @@
 
 const std::string kBackdropFile = "backdrop.jpg";
 const std::string kBackdropFrameFile = "backdropframe.png";
+const std::string kPspBackdropFile = "pspbackdrop.jpg";
 
 GuiBackground::GuiBackground(GameObserver* observer)
     : GuiLayer(observer)
@@ -28,14 +29,20 @@ void GuiBackground::Render()
     }
     if (!quad.get())
     {
+#if !defined (PSP)
         quad = WResourceManager::Instance()->RetrieveTempQuad(kBackdropFile);
+#else
+        quad = WResourceManager::Instance()->RetrieveTempQuad(kPspBackdropFile);
+#endif
     }
     if (quad.get())
     {
         renderer->RenderQuad(quad.get(), 0, 0, 0, SCREEN_WIDTH_F / quad->mWidth, SCREEN_HEIGHT_F / quad->mHeight);
     }
+#if !defined (PSP)
     if (quadframe.get())
     {
         renderer->RenderQuad(quadframe.get(), 0, 0, 0, SCREEN_WIDTH_F / quadframe->mWidth, SCREEN_HEIGHT_F / quadframe->mHeight);
     }
+#endif
 }

projects/mtg/src/GuiPhaseBar.cpp

@@ -149,6 +149,7 @@ void GuiPhaseBar::Render()
     string phaseNameToTranslate = observer->phaseRing->phaseName(displayedPhaseId%kPhases + 1);
     phaseNameToTranslate = _(phaseNameToTranslate);
     sprintf(buf, _("(%s%s) %s").c_str(), currentP.c_str(), interrupt.c_str(),phaseNameToTranslate.c_str());
+#if !defined (PSP)
     if(phaseinfo.get())
     {
         
@@ -157,6 +158,7 @@ void GuiPhaseBar::Render()
         //phaseinfo->mHeight = font->GetHeight()+5.f;
         JRenderer::GetInstance()->RenderQuad(phaseinfo.get(),SCREEN_WIDTH_F,0,0,2.2f, SCREEN_HEIGHT_F / phaseinfo->mHeight);
     }
+#endif
     font->DrawString(buf, SCREEN_WIDTH - 5, 2, JGETEXT_RIGHT);
 }
 

projects/mtg/src/SimplePopup.cpp

@@ -35,15 +35,17 @@ void SimplePopup::Render()
 {
     mClosed = false;
     float modX = (SCREEN_WIDTH_F / 2)-5;
-    JQuadPtr statsholder = WResourceManager::Instance()->RetrieveTempQuad("statsholder.png");//new graphics statsholder
 
     JRenderer *r = JRenderer::GetInstance();
     string detailedInformation = getDetailedInformation(mDeckInformation->getFilename());
-
+#if !defined (PSP)
+    
+    JQuadPtr statsholder = WResourceManager::Instance()->RetrieveTempQuad("statsholder.png");//new graphics statsholder
     //const float textHeight = mTextFont->GetHeight() * mMaxLines;
     //r->FillRect(0,0,SCREEN_WIDTH_F,SCREEN_HEIGHT_F,ARGB(220,15,15,15));
     if(statsholder.get())
         r->RenderQuad(statsholder.get(),0,0,0,SCREEN_WIDTH_F/statsholder->mWidth,SCREEN_HEIGHT_F/statsholder->mHeight);
+#endif
     r->FillRoundRect(mX+modX+3, mY + 7, 190.f, 148.f, 0, ARGB( 240, 15, 15, 15 ) );
 
     // currently causes a crash on the PSP when drawing the corners.

projects/mtg/src/TextScroller.cpp

@@ -165,13 +165,17 @@ void VerticalTextScroller::Render()
     WFont * mFont = WResourceManager::Instance()->GetWFont(fontId);
     JQuadPtr textscroller;
     JQuadPtr textscrollershadow;
+#if !defined (PSP)
     textscroller = WResourceManager::Instance()->RetrieveTempQuad("textscroller.png");//new graphics textscroller
     textscrollershadow = WResourceManager::Instance()->RetrieveTempQuad("textscrollershadow.png");//new graphics textscroller shadow
     if(!mText.empty() && mText.length() > 1)
         if (textscrollershadow.get())
             JRenderer::GetInstance()->RenderQuad(textscrollershadow.get(), 0, 0, 0 ,SCREEN_WIDTH_F / textscrollershadow->mWidth, SCREEN_HEIGHT_F / textscrollershadow->mHeight);
+#endif
     mFont->DrawString(mText.c_str(), mX, mY);
+#if !defined (PSP)
     if(!mText.empty() && mText.length() > 1)
         if (textscroller.get())
             JRenderer::GetInstance()->RenderQuad(textscroller.get(), 0, 0, 0 ,SCREEN_WIDTH_F / textscroller->mWidth, SCREEN_HEIGHT_F / textscroller->mHeight);
+#endif
 }