diff --git a/data/forms.ini.pp b/data/forms.ini.pp index 708e8f2..7c9b6d9 100644 --- a/data/forms.ini.pp +++ b/data/forms.ini.pp @@ -18,7 +18,7 @@ [kidfInputUI] FORM=(0 0 160 68) kidcOk FORMBACKCOLOR=kiclrFormBackground - BUTTON=kidcMenuButton (0 0 23 7) "" kifntButton nocenter menuup.tbm menudown.tbm + BUTTON=kidcMenuButton (0 0 23 7) "" kifntButton nocenter menuup.png menudown.png GRAFFITISCROLL=kidcGraffitiScroll (0 9 0 0) 4 SILKBUTTON=kidcAppsSilkButton (0 0 0 0) SILKBUTTON=kidcMenuSilkButton (0 0 0 0) @@ -34,7 +34,7 @@ [kidfStartup] FORM=(0 0 240 160) kidcCancel center FORMBACKCOLOR=kiclrFormBackground - BITMAP=0 (28 7 0 0) title.rbm + BITMAP=0 (28 7 0 0) title.png BUTTON=kidcPlay (65 59 110 14) "PLAY" kifntButton BUTTON=kidcLeaderboard (65 76 110 14) "LEADERBOARD" kifntButton BUTTON=kidcLoadSavedGame (65 93 110 14) "LOAD SAVED GAME" kifntButton @@ -43,7 +43,7 @@ BUTTON=kidcSetupGame (65 127 39 14) "OPTIONS" kifntButton BUTTON=kidcHelp (105 127 30 14) "HELP" kifntButton BUTTON=kidcForums (136 127 39 14) "FORUMS" kifntButton - BITMAP=0 (52 148 0 0) copyright.rbm + BITMAP=0 (52 148 0 0) copyright.png LABEL=kidcVersion (239 148 0 12) "" kifntShadow right [kidfPlay] @@ -473,8 +473,8 @@ [kidfBuildInfantry] FORM=(0 0 160 143) kidcCancel LABEL=0 (2 5 82 0) "RECRUIT PERSONNEL" kifntTitle - BUTTON=kidcHelp (135 3 10 12) "" kifntButton nocenter helpup.tbm helpdown.tbm - BUTTON=kidcCancel (147 3 10 12) "" kifntButton nocenter cancelup.tbm canceldown.tbm + BUTTON=kidcHelp (135 3 10 12) "" kifntButton nocenter helpup.png helpdown.png + BUTTON=kidcCancel (147 3 10 12) "" kifntButton nocenter cancelup.png canceldown.png ANIMLIST=kidcList (-1 17 28 121) kifntShadow 17 LABEL=kidcDescription (30 79 127 8) "" kifntShadow left multiline LABEL=kidcName (30 19 75 0) "" kifntShadow @@ -500,8 +500,8 @@ [kidfBuildVehicle] FORM=(0 0 160 143) kidcCancel LABEL=0 (2 5 82 0) "ORDER VEHICLE" kifntTitle - BUTTON=kidcHelp (135 3 10 12) "" kifntButton nocenter helpup.tbm helpdown.tbm - BUTTON=kidcCancel (147 3 10 12) "" kifntButton nocenter cancelup.tbm canceldown.tbm + BUTTON=kidcHelp (135 3 10 12) "" kifntButton nocenter helpup.png helpdown.png + BUTTON=kidcCancel (147 3 10 12) "" kifntButton nocenter cancelup.png canceldown.png ANIMLIST=kidcList (-1 17 28 121) kifntShadow 17 LABEL=kidcDescription (30 79 127 8) "" kifntShadow left multiline LABEL=kidcName (30 19 75 0) "" kifntShadow @@ -527,8 +527,8 @@ [kidfBuildStructure] FORM=(0 0 160 143) kidcCancel LABEL=0 (2 5 82 0) "ORDER BUILDING" kifntTitle - BUTTON=kidcHelp (135 3 10 12) "" kifntButton nocenter helpup.tbm helpdown.tbm - BUTTON=kidcCancel (147 3 10 12) "" kifntButton nocenter cancelup.tbm canceldown.tbm + BUTTON=kidcHelp (135 3 10 12) "" kifntButton nocenter helpup.png helpdown.png + BUTTON=kidcCancel (147 3 10 12) "" kifntButton nocenter cancelup.png canceldown.png ANIMLIST=kidcList (-1 17 28 121) kifntShadow 18 LABEL=kidcDescription (30 79 127 8) "" kifntShadow left multiline LABEL=kidcName (30 19 75 0) "UNIT NAME" kifntShadow @@ -553,8 +553,8 @@ [kidfUpgrade] FORM=(0 0 160 143) kidcCancel LABEL=0 (2 5 82 0) "R&D TECHNOLOGIES" kifntTitle - BUTTON=kidcHelp (135 3 10 12) "" kifntButton nocenter helpup.tbm helpdown.tbm - BUTTON=kidcCancel (147 3 10 12) "" kifntButton nocenter cancelup.tbm canceldown.tbm + BUTTON=kidcHelp (135 3 10 12) "" kifntButton nocenter helpup.png helpdown.png + BUTTON=kidcCancel (147 3 10 12) "" kifntButton nocenter cancelup.png canceldown.png ANIMLIST=kidcList (-1 17 28 121) kifntShadow 18 LABEL=kidcName (30 19 75 0) "UPGRADE NAME" kifntShadow LABEL=kidcCostLabel (30 31 22 0) "COST" kifntShadow @@ -568,49 +568,49 @@ [kidfPlaceStructure] FORM=(0 0 320 320) kidcCancel - BUTTON=kidcOk (120 135 10 12) "" kifntButton nocenter okup.tbm okdown.tbm - BUTTON=kidcCancel (0 135 10 12) "" kifntButton nocenter cancelup.tbm canceldown.tbm + BUTTON=kidcOk (120 135 10 12) "" kifntButton nocenter okup.png okdown.png + BUTTON=kidcCancel (0 135 10 12) "" kifntButton nocenter cancelup.png canceldown.png [kidfHrcMenu] FORM=(0 0 66 68) kidcCancel LABEL=kidcTitle (0 2 66 0) "" kifntTitle center - BUTTON=kidcBuild (3 14 60 12) "" kifntButton nocenter build_btn_up.tbm build_btn_down.tbm build_btn_disabled.tbm - BUTTON=kidcRepair (3 31 60 12) "" kifntButton nocenter repair_btn_up.tbm repair_btn_down.tbm repair_btn_disabled.tbm - BUTTON=kidcAbortRepair (3 31 60 12) "" kifntButton nocenter abort_repair_btn_up.tbm abort_repair_btn_down.tbm - BUTTON=kidcSelfDestruct (3 48 60 12) "" kifntButton nocenter sell_btn_up.tbm sell_btn_down.tbm sell_btn_disabled.tbm + BUTTON=kidcBuild (3 14 60 12) "" kifntButton nocenter build_btn_up.png build_btn_down.png build_btn_disabled.png + BUTTON=kidcRepair (3 31 60 12) "" kifntButton nocenter repair_btn_up.png repair_btn_down.png repair_btn_disabled.png + BUTTON=kidcAbortRepair (3 31 60 12) "" kifntButton nocenter abort_repair_btn_up.png abort_repair_btn_down.png + BUTTON=kidcSelfDestruct (3 48 60 12) "" kifntButton nocenter sell_btn_up.png sell_btn_down.png sell_btn_disabled.png [kidfVtsMenu] FORM=(0 0 66 68) kidcCancel LABEL=kidcTitle (0 2 66 0) "" kifntTitle center - BUTTON=kidcBuild (3 14 60 12) "" kifntButton nocenter build_btn_up.tbm build_btn_down.tbm build_btn_disabled.tbm - BUTTON=kidcRepair (3 31 60 12) "" kifntButton nocenter repair_btn_up.tbm repair_btn_down.tbm repair_btn_disabled.tbm - BUTTON=kidcAbortRepair (3 31 60 12) "" kifntButton nocenter abort_repair_btn_up.tbm abort_repair_btn_down.tbm - BUTTON=kidcSelfDestruct (3 48 60 12) "" kifntButton nocenter sell_btn_up.tbm sell_btn_down.tbm sell_btn_disabled.tbm + BUTTON=kidcBuild (3 14 60 12) "" kifntButton nocenter build_btn_up.png build_btn_down.png build_btn_disabled.png + BUTTON=kidcRepair (3 31 60 12) "" kifntButton nocenter repair_btn_up.png repair_btn_down.png repair_btn_disabled.png + BUTTON=kidcAbortRepair (3 31 60 12) "" kifntButton nocenter abort_repair_btn_up.png abort_repair_btn_down.png + BUTTON=kidcSelfDestruct (3 48 60 12) "" kifntButton nocenter sell_btn_up.png sell_btn_down.png sell_btn_disabled.png [kidfHqMenu] FORM=(0 0 66 68) kidcCancel LABEL=kidcTitle (0 2 66 0) "" kifntTitle center - BUTTON=kidcBuild (0 14 0 0) "" kifntButton nocenter build_btn_up.tbm build_btn_down.tbm build_btn_disabled.tbm - BUTTON=kidcAbortBuild (0 14 0 0) "" kifntButton nocenter abort_build_btn_up.tbm abort_build_btn_down.tbm - BUTTON=kidcRepair (14 14 0 0) "" kifntButton nocenter repair_btn_up.tbm repair_btn_down.tbm repair_btn_disabled.tbm - BUTTON=kidcAbortRepair (14 14 0 0) "" kifntButton nocenter abort_repair_btn_up.tbm abort_repair_btn_down.tbm - BUTTON=kidcSelfDestruct (28 14 0 0) "" kifntButton nocenter sell_btn_up.tbm sell_btn_down.tbm sell_btn_disabled.tbm + BUTTON=kidcBuild (0 14 0 0) "" kifntButton nocenter build_btn_up.png build_btn_down.png build_btn_disabled.png + BUTTON=kidcAbortBuild (0 14 0 0) "" kifntButton nocenter abort_build_btn_up.png abort_build_btn_down.png + BUTTON=kidcRepair (14 14 0 0) "" kifntButton nocenter repair_btn_up.png repair_btn_down.png repair_btn_disabled.png + BUTTON=kidcAbortRepair (14 14 0 0) "" kifntButton nocenter abort_repair_btn_up.png abort_repair_btn_down.png + BUTTON=kidcSelfDestruct (28 14 0 0) "" kifntButton nocenter sell_btn_up.png sell_btn_down.png sell_btn_disabled.png [kidfResearchMenu] FORM=(0 0 76 68) kidcCancel LABEL=kidcTitle (0 2 76 0) "" kifntTitle center - BUTTON=kidcResearch (3 14 60 12) "" kifntButton nocenter build_btn_up.tbm build_btn_down.tbm build_btn_disabled.tbm - BUTTON=kidcAbortUpgrade (3 14 60 12) "" kifntButton nocenter abort_build_btn_up.tbm abort_build_btn_down.tbm - BUTTON=kidcRepair (3 31 60 12) "" kifntButton nocenter repair_btn_up.tbm repair_btn_down.tbm repair_btn_disabled.tbm - BUTTON=kidcAbortRepair (3 31 60 12) "" kifntButton nocenter abort_repair_btn_up.tbm abort_repair_btn_down.tbm - BUTTON=kidcSelfDestruct (3 48 60 12) "" kifntButton nocenter sell_btn_up.tbm sell_btn_down.tbm sell_btn_disabled.tbm + BUTTON=kidcResearch (3 14 60 12) "" kifntButton nocenter build_btn_up.png build_btn_down.png build_btn_disabled.png + BUTTON=kidcAbortUpgrade (3 14 60 12) "" kifntButton nocenter abort_build_btn_up.png abort_build_btn_down.png + BUTTON=kidcRepair (3 31 60 12) "" kifntButton nocenter repair_btn_up.png repair_btn_down.png repair_btn_disabled.png + BUTTON=kidcAbortRepair (3 31 60 12) "" kifntButton nocenter abort_repair_btn_up.png abort_repair_btn_down.png + BUTTON=kidcSelfDestruct (3 48 60 12) "" kifntButton nocenter sell_btn_up.png sell_btn_down.png sell_btn_disabled.png [kidfStructMenu] FORM=(0 0 66 51) kidcCancel LABEL=kidcTitle (0 2 66 0) "" kifntTitle center - BUTTON=kidcRepair (3 31 60 12) "" kifntButton nocenter repair_btn_up.tbm repair_btn_down.tbm repair_btn_disabled.tbm - BUTTON=kidcAbortRepair (3 31 60 12) "" kifntButton nocenter abort_repair_btn_up.tbm abort_repair_btn_down.tbm - BUTTON=kidcSelfDestruct (3 48 60 12) "" kifntButton nocenter sell_btn_up.tbm sell_btn_down.tbm sell_btn_disabled.tbm + BUTTON=kidcRepair (3 31 60 12) "" kifntButton nocenter repair_btn_up.png repair_btn_down.png repair_btn_disabled.png + BUTTON=kidcAbortRepair (3 31 60 12) "" kifntButton nocenter abort_repair_btn_up.png abort_repair_btn_down.png + BUTTON=kidcSelfDestruct (3 48 60 12) "" kifntButton nocenter sell_btn_up.png sell_btn_down.png sell_btn_disabled.png [kidfUnitMenu] FORM=(0 0 66 51) kidcCancel @@ -682,8 +682,8 @@ FORM=(0 0 160 150) kidcOk LABEL=kidcFrom (3 19 56 0) "Olstrom@@acme" kifntShadow LABEL=kidcTo (3 34 54 0) "Olstrom@@acme" kifntShadow - BITMAP=kidcFromBitmap (80 4 0 0) olstrom.tbm - BITMAP=kidcToBitmap (121 4 0 0) jana.tbm + BITMAP=kidcFromBitmap (80 4 0 0) olstrom.png + BITMAP=kidcToBitmap (121 4 0 0) jana.png ECOMTEXT=kidcMessage (4 50 152 81) "EcomText" kifntEcom left BUTTON=kidcOk (108 135 50 12) "OK" kifntButton @@ -699,18 +699,18 @@ HELP=kidcHelp (5 6 150 130) BUTTON=kidcOk (5 140 45 12) "OK" kifntButton BUTTON=kidcIndex (55 140 45 12) "Index" kifntButton - BUTTON=kidcBack (119 142 6 6) "" kifntButton nocenter backup.tbm backdown.tbm - BUTTON=kidcNextPage (130 144 4 4) "" kifntButton nocenter scrolldownup.tbm scrolldowndown.tbm - BUTTON=kidcPrevPage (140 144 4 4) "" kifntButton nocenter scrollupup.tbm scrollupdown.tbm + BUTTON=kidcBack (119 142 6 6) "" kifntButton nocenter backup.png backdown.png + BUTTON=kidcNextPage (130 144 4 4) "" kifntButton nocenter scrolldownup.png scrolldowndown.png + BUTTON=kidcPrevPage (140 144 4 4) "" kifntButton nocenter scrollupup.png scrollupdown.png [kidfHelpWide] FORM=(0 0 240 160) kidcOk center HELP=kidcHelp (5 6 228 130) BUTTON=kidcOk (70 140 45 12) "OK" kifntButton BUTTON=kidcIndex (125 140 45 12) "Index" kifntButton - BUTTON=kidcBack (189 142 6 6) "" kifntButton nocenter backup.tbm backdown.tbm - BUTTON=kidcNextPage (200 144 4 4) "" kifntButton nocenter scrolldownup.tbm scrolldowndown.tbm - BUTTON=kidcPrevPage (210 144 4 4) "" kifntButton nocenter scrollupup.tbm scrollupdown.tbm + BUTTON=kidcBack (189 142 6 6) "" kifntButton nocenter backup.png backdown.png + BUTTON=kidcNextPage (200 144 4 4) "" kifntButton nocenter scrolldownup.png scrolldowndown.png + BUTTON=kidcPrevPage (210 144 4 4) "" kifntButton nocenter scrollupup.png scrollupdown.png [kidfCutScene] FORM=(0 0 160 160) kidcOk center @@ -726,7 +726,7 @@ FORM=(0 0 160 160) kidcExitGame center FORMBACKCOLOR=kiclrFormBackground LABEL=0 (80 9 0 0) "HANDMARK PRESENTS" kifntTitle center - BITMAP=0 (0 17 0 0) title.rbm + BITMAP=0 (0 17 0 0) title.png LABEL=0 (30 60 100 8) "Copyright 2003, 2004 Spiffcode, Inc." kifntDefault center LABEL=0 (30 70 100 8) "All Rights Reserved" kifntDefault center LABEL=0 (8 91 143 8) "Purchase at www.WarfareIncorporated.com" kifntDefault center diff --git a/game/Ecom.cpp b/game/Ecom.cpp index 5e3c825..fe53444 100644 --- a/game/Ecom.cpp +++ b/game/Ecom.cpp @@ -50,7 +50,7 @@ static char *s_aszNames[] = {\ "", "Andy: ", "Jana: ", "Olstrom: ", "Fox: ", "ACME Security: ", "OMNI Security: ", "Anonymous: ", "" }; static char *s_aszPortraits[] = { - NULL, "andyportrait.tbm", "jana.tbm", "olstrom.tbm", "fox.tbm", NULL, NULL, NULL, NULL + NULL, "andyportrait.png", "jana.png", "olstrom.png", "fox.png", NULL, NULL, NULL, NULL }; void Ecom(int nCharFrom, int nCharTo, char *pszMessage, int nBackground, bool fMore) @@ -274,7 +274,7 @@ void EcomForm::OnControlSelected(word idc) void EcomForm::OnPaintBackground(DibBitmap *pbm, UpdateMap *pupd) { - RawBitmap *prbm = LoadRawBitmap(GetId() == kidfEcomLarge ? (char *)"ecomlargebkgd.rbm" : (char *)"ecomsmallbkgd.rbm"); + RawBitmap *prbm = LoadRawBitmap(GetId() == kidfEcomLarge ? (char *)"ecomlargebkgd.png" : (char *)"ecomsmallbkgd.png"); BltHelper(pbm, prbm, pupd, m_rc.left, m_rc.top); delete prbm; } diff --git a/game/GameObjects.cpp b/game/GameObjects.cpp index 197b01a..7303528 100644 --- a/game/GameObjects.cpp +++ b/game/GameObjects.cpp @@ -996,15 +996,15 @@ static TBitmap *s_aptbmArrows[9]; void LoadArrows() { - s_aptbmArrows[0] = CreateTBitmap("arrow0.tbm"); - s_aptbmArrows[1] = CreateTBitmap("arrow1.tbm"); - s_aptbmArrows[2] = CreateTBitmap("arrow2.tbm"); - s_aptbmArrows[3] = CreateTBitmap("arrow3.tbm"); - s_aptbmArrows[4] = CreateTBitmap("arrow4.tbm"); - s_aptbmArrows[5] = CreateTBitmap("arrow5.tbm"); - s_aptbmArrows[6] = CreateTBitmap("arrow6.tbm"); - s_aptbmArrows[7] = CreateTBitmap("arrow7.tbm"); - s_aptbmArrows[8] = CreateTBitmap("x.tbm"); + s_aptbmArrows[0] = CreateTBitmap("arrow0.png"); + s_aptbmArrows[1] = CreateTBitmap("arrow1.png"); + s_aptbmArrows[2] = CreateTBitmap("arrow2.png"); + s_aptbmArrows[3] = CreateTBitmap("arrow3.png"); + s_aptbmArrows[4] = CreateTBitmap("arrow4.png"); + s_aptbmArrows[5] = CreateTBitmap("arrow5.png"); + s_aptbmArrows[6] = CreateTBitmap("arrow6.png"); + s_aptbmArrows[7] = CreateTBitmap("arrow7.png"); + s_aptbmArrows[8] = CreateTBitmap("x.png"); } void FreeArrows() diff --git a/game/Headquarters.cpp b/game/Headquarters.cpp index c29cee3..1e369b8 100644 --- a/game/Headquarters.cpp +++ b/game/Headquarters.cpp @@ -75,8 +75,8 @@ bool HqGob::InitClass(IniReader *pini) // Preload the placement tile bitmaps - s_ptbmPlacementGood = CreateTBitmap("placementGood.tbm"); - s_ptbmPlacementBad = CreateTBitmap("placementBad.tbm"); + s_ptbmPlacementGood = CreateTBitmap("placementGood.png"); + s_ptbmPlacementBad = CreateTBitmap("placementBad.png"); // Sound effects @@ -517,7 +517,7 @@ void StructureBuildForm::OnControlNotify(word idc, int nNotify) void StructureBuildForm::OnPaintBackground(DibBitmap *pbm, UpdateMap *pupd) { - TBitmap *ptbm = CreateTBitmap("buildformbkgd.rbm"); + TBitmap *ptbm = CreateTBitmap("buildformbkgd.png"); BltHelper(pbm, ptbm, pupd, m_rc.left, m_rc.top); delete ptbm; } diff --git a/game/Research.cpp b/game/Research.cpp index e945953..bc97be9 100644 --- a/game/Research.cpp +++ b/game/Research.cpp @@ -587,7 +587,7 @@ void UpgradeForm::OnControlSelected(word idc) void UpgradeForm::OnPaintBackground(DibBitmap *pbm, UpdateMap *pupd) { - TBitmap *ptbm = CreateTBitmap("buildformbkgd.rbm"); + TBitmap *ptbm = CreateTBitmap("buildformbkgd.png"); BltHelper(pbm, ptbm, pupd, m_rc.left, m_rc.top); delete ptbm; } diff --git a/game/Shell.cpp b/game/Shell.cpp index ccf8882..65e3f13 100644 --- a/game/Shell.cpp +++ b/game/Shell.cpp @@ -963,7 +963,7 @@ void ShellForm::OnPaintBackground(DibBitmap *pbm, UpdateMap *pupd) Size sizDib; pbm->GetSize(&sizDib); - TBitmap *ptbm = CreateTBitmap("titlescreenbkgd.rbm"); + TBitmap *ptbm = CreateTBitmap("titlescreenbkgd.png"); Size sizBmp; ptbm->GetSize(&sizBmp); diff --git a/game/Struct.cpp b/game/Struct.cpp index 20c5a93..5a83e65 100644 --- a/game/Struct.cpp +++ b/game/Struct.cpp @@ -98,9 +98,9 @@ bool StructGob::InitClass(StructConsts *pstruc, IniReader *pini) // Preload the repair symbol bitmap if (s_ptbmRepairing == NULL) { - s_ptbmRepairing = CreateTBitmap("repairing_symbol.tbm"); + s_ptbmRepairing = CreateTBitmap("repairing_symbol.png"); if (s_ptbmRepairing == NULL) { - Assert("Failed to load repairing_symbol.tbm"); + Assert("Failed to load repairing_symbol.png"); return false; } } @@ -108,9 +108,9 @@ bool StructGob::InitClass(StructConsts *pstruc, IniReader *pini) // Preload the needs power symbol bitmap if (s_ptbmNeedsPower == NULL) { - s_ptbmNeedsPower = CreateTBitmap("needs_power_symbol.tbm"); + s_ptbmNeedsPower = CreateTBitmap("needs_power_symbol.png"); if (s_ptbmNeedsPower == NULL) { - Assert("Failed to load needs_power_symbol.tbm"); + Assert("Failed to load needs_power_symbol.png"); return false; } } @@ -118,9 +118,9 @@ bool StructGob::InitClass(StructConsts *pstruc, IniReader *pini) // Preload the need credits symbol bitmap if (s_ptbmNeedCredits == NULL) { - s_ptbmNeedCredits = CreateTBitmap("needs_credits_symbol.tbm"); + s_ptbmNeedCredits = CreateTBitmap("needs_credits_symbol.png"); if (s_ptbmNeedCredits == NULL) { - Assert("Failed to load need_credits_symbol.tbm"); + Assert("Failed to load need_credits_symbol.png"); return false; } } diff --git a/game/Unit.cpp b/game/Unit.cpp index a5caa94..0f4b675 100644 --- a/game/Unit.cpp +++ b/game/Unit.cpp @@ -189,10 +189,10 @@ bool UnitGob::InitClass(UnitConsts *puntc, IniReader *pini) // If they aren't already loaded, load the scorch marks if (gaptbmScorches[0] == NULL) { - gaptbmScorches[0] = CreateTBitmap("scorch_8x8.tbm"); - gaptbmScorches[1] = CreateTBitmap("scorch_16x16.tbm"); - gaptbmScorches[2] = CreateTBitmap("scorch_32x16.tbm"); - gaptbmScorches[3] = CreateTBitmap("scorch_48x48.tbm"); + gaptbmScorches[0] = CreateTBitmap("scorch_8x8.png"); + gaptbmScorches[1] = CreateTBitmap("scorch_16x16.png"); + gaptbmScorches[2] = CreateTBitmap("scorch_32x16.png"); + gaptbmScorches[3] = CreateTBitmap("scorch_48x48.png"); } return true; diff --git a/game/fogmap.cpp b/game/fogmap.cpp index dbcb8f9..03a1d1e 100644 --- a/game/fogmap.cpp +++ b/game/fogmap.cpp @@ -58,21 +58,21 @@ bool FogMap::Init(Size *psizTile, Size *psizMap) // Load the edges m_aptbm[15] = NULL; - m_aptbm[14] = CreateTBitmap("fog0001.tbm"); - m_aptbm[13] = CreateTBitmap("fog0010.tbm"); - m_aptbm[12] = CreateTBitmap("fog0011.tbm"); - m_aptbm[11] = CreateTBitmap("fog0100.tbm"); - m_aptbm[10] = CreateTBitmap("fog0101.tbm"); + m_aptbm[14] = CreateTBitmap("fog0001.png"); + m_aptbm[13] = CreateTBitmap("fog0010.png"); + m_aptbm[12] = CreateTBitmap("fog0011.png"); + m_aptbm[11] = CreateTBitmap("fog0100.png"); + m_aptbm[10] = CreateTBitmap("fog0101.png"); m_aptbm[9] = NULL; - m_aptbm[8] = CreateTBitmap("fog0111.tbm"); - m_aptbm[7] = CreateTBitmap("fog1000.tbm"); + m_aptbm[8] = CreateTBitmap("fog0111.png"); + m_aptbm[7] = CreateTBitmap("fog1000.png"); m_aptbm[6] = NULL; - m_aptbm[5] = CreateTBitmap("fog1010.tbm"); - m_aptbm[4] = CreateTBitmap("fog1011.tbm"); - m_aptbm[3] = CreateTBitmap("fog1100.tbm"); - m_aptbm[2] = CreateTBitmap("fog1101.tbm"); - m_aptbm[1] = CreateTBitmap("fog1110.tbm"); - m_aptbm[0] = CreateTBitmap("fog1111.tbm"); + m_aptbm[5] = CreateTBitmap("fog1010.png"); + m_aptbm[4] = CreateTBitmap("fog1011.png"); + m_aptbm[3] = CreateTBitmap("fog1100.png"); + m_aptbm[2] = CreateTBitmap("fog1101.png"); + m_aptbm[1] = CreateTBitmap("fog1110.png"); + m_aptbm[0] = CreateTBitmap("fog1111.png"); int c = 0; int n; @@ -83,15 +83,15 @@ bool FogMap::Init(Size *psizTile, Size *psizMap) if (c != 3) return false; - m_aptbmGalax[0] = CreateTBitmap("galax1a.tbm"); - m_aptbmGalax[1] = CreateTBitmap("galax1b.tbm"); - m_aptbmGalax[2] = CreateTBitmap("galax1c.tbm"); - m_aptbmGalax[3] = CreateTBitmap("galax2a.tbm"); - m_aptbmGalax[4] = CreateTBitmap("galax2b.tbm"); - m_aptbmGalax[5] = CreateTBitmap("galax2c.tbm"); - m_aptbmGalax[6] = CreateTBitmap("galax3a.tbm"); - m_aptbmGalax[7] = CreateTBitmap("galax3b.tbm"); - m_aptbmGalax[8] = CreateTBitmap("galax3c.tbm"); + m_aptbmGalax[0] = CreateTBitmap("galax1a.png"); + m_aptbmGalax[1] = CreateTBitmap("galax1b.png"); + m_aptbmGalax[2] = CreateTBitmap("galax1c.png"); + m_aptbmGalax[3] = CreateTBitmap("galax2a.png"); + m_aptbmGalax[4] = CreateTBitmap("galax2b.png"); + m_aptbmGalax[5] = CreateTBitmap("galax2c.png"); + m_aptbmGalax[6] = CreateTBitmap("galax3a.png"); + m_aptbmGalax[7] = CreateTBitmap("galax3b.png"); + m_aptbmGalax[8] = CreateTBitmap("galax3c.png"); for (n = 0; n < 9; n++) { diff --git a/game/game.cpp b/game/game.cpp index c80eb92..8cc067c 100644 --- a/game/game.cpp +++ b/game/game.cpp @@ -1217,7 +1217,7 @@ bool Game::InitMultiFormMgr() // is dynamically sized and repositioned based on knowledge of how the game form is // layed out. - TBitmap *ptbmMenuButton = CreateTBitmap("menuup.tbm"); + TBitmap *ptbmMenuButton = CreateTBitmap("menuup.png"); if (ptbmMenuButton == NULL) { return false; } diff --git a/game/misccontrols.cpp b/game/misccontrols.cpp index 1f34aad..f75a8dc 100644 --- a/game/misccontrols.cpp +++ b/game/misccontrols.cpp @@ -13,12 +13,12 @@ TBitmap *ButtonControl::s_ptbmRightDown; bool ButtonControl::InitClass() { - s_ptbmLeftUp = CreateTBitmap("buttonleftup.tbm"); - s_ptbmMidUp = CreateTBitmap("buttonmidup.tbm"); - s_ptbmRightUp = CreateTBitmap("buttonrightup.tbm"); - s_ptbmLeftDown = CreateTBitmap("buttonleftdown.tbm"); - s_ptbmMidDown = CreateTBitmap("buttonmiddown.tbm"); - s_ptbmRightDown = CreateTBitmap("buttonrightdown.tbm"); + s_ptbmLeftUp = CreateTBitmap("buttonleftup.png"); + s_ptbmMidUp = CreateTBitmap("buttonmidup.png"); + s_ptbmRightUp = CreateTBitmap("buttonrightup.png"); + s_ptbmLeftDown = CreateTBitmap("buttonleftdown.png"); + s_ptbmMidDown = CreateTBitmap("buttonmiddown.png"); + s_ptbmRightDown = CreateTBitmap("buttonrightdown.png"); return true; } @@ -111,7 +111,7 @@ bool ButtonControl::Init(Form *pfrm, IniReader *pini, FindProp *pfind) if (!Control::Init(pfrm, pini, pfind)) return false; - // idc (x y cx cy) "label" nfnt center buttonup.tbm buttondown.tbm + // idc (x y cx cy) "label" nfnt center buttonup.png buttondown.png char szFnUp[kcbFilename]; char szFnDown[kcbFilename]; @@ -349,10 +349,10 @@ bool CheckBoxControl::Init(Form *pfrm, word idc, int x, int y, char *pszLabel, i bool CheckBoxControl::InitClass() { - s_ptbmOnUp = CreateTBitmap("checkboxonup.tbm"); - s_ptbmOnDown = CreateTBitmap("checkboxondown.tbm"); - s_ptbmOffUp = CreateTBitmap("checkboxoffup.tbm"); - s_ptbmOffDown = CreateTBitmap("checkboxoffdown.tbm"); + s_ptbmOnUp = CreateTBitmap("checkboxonup.png"); + s_ptbmOnDown = CreateTBitmap("checkboxondown.png"); + s_ptbmOffUp = CreateTBitmap("checkboxoffup.png"); + s_ptbmOffDown = CreateTBitmap("checkboxoffdown.png"); return true; } @@ -728,7 +728,7 @@ bool BitmapControl::Init(Form *pfrm, IniReader *pini, FindProp *pfind) if (!Control::Init(pfrm, pini, pfind)) return false; - // idc (x y cx cy) bitmap.tbm + // idc (x y cx cy) bitmap.png char szBitmap[kcbFilename]; int cArgs = pini->GetPropertyValue(pfind, "%*d (%*d %*d %*d %*d) %s", szBitmap); @@ -851,10 +851,10 @@ TBitmap *ListControl::s_ptbmScrollDownDown; bool ListControl::InitClass() { - s_ptbmScrollUpUp = CreateTBitmap("scrollupup.tbm"); - s_ptbmScrollUpDown = CreateTBitmap("scrollupdown.tbm"); - s_ptbmScrollDownUp = CreateTBitmap("scrolldownup.tbm"); - s_ptbmScrollDownDown = CreateTBitmap("scrolldowndown.tbm"); + s_ptbmScrollUpUp = CreateTBitmap("scrollupup.png"); + s_ptbmScrollUpDown = CreateTBitmap("scrollupdown.png"); + s_ptbmScrollDownUp = CreateTBitmap("scrolldownup.png"); + s_ptbmScrollDownDown = CreateTBitmap("scrolldowndown.png"); return true; } @@ -1735,7 +1735,7 @@ TBitmap *PipMeterControl::s_ptbmPip; bool PipMeterControl::InitClass() { - s_ptbmPip = CreateTBitmap("pip.tbm"); + s_ptbmPip = CreateTBitmap("pip.png"); return true; } @@ -1779,7 +1779,7 @@ bool PipMeterControl::Init(Form *pfrm, IniReader *pini, FindProp *pfind) if (!Control::Init(pfrm, pini, pfind)) return false; - // idc (x y cx cy) [pip.tbm] + // idc (x y cx cy) [pip.png] char szPip[kcbFilename]; @@ -1831,9 +1831,9 @@ TBitmap *DamageMeterControl::s_ptbmStructure; bool DamageMeterControl::InitClass() { - s_ptbmInfantry = CreateTBitmap("damage_infantry.tbm"); - s_ptbmVehicle = CreateTBitmap("damage_vehicle.tbm"); - s_ptbmStructure = CreateTBitmap("damage_structure.tbm"); + s_ptbmInfantry = CreateTBitmap("damage_infantry.png"); + s_ptbmVehicle = CreateTBitmap("damage_vehicle.png"); + s_ptbmStructure = CreateTBitmap("damage_structure.png"); return true; } diff --git a/game/tests.cpp b/game/tests.cpp index a0c89cb..4c2603f 100644 --- a/game/tests.cpp +++ b/game/tests.cpp @@ -21,7 +21,7 @@ void DoTimeTest(DibBitmap *pbm) long lEnd; long n; - TBitmap *ptbmCode = (TBitmap *)CreateTBitmap("srtest.tbm"); + TBitmap *ptbmCode = (TBitmap *)CreateTBitmap("srtest.png"); //ptbmCode->CompileTest(c); //ptbmCode->DrawTest(pbm, c); delete ptbmCode; @@ -36,7 +36,7 @@ void DoTimeTest(DibBitmap *pbm) #if 0 ptbm = ptbmCode; - //ptbm = CreateTBitmap("srtest.tbm"); + //ptbm = CreateTBitmap("srtest.png"); ptbm->BltTo(pbm, -24, 10); lStart = HostGetTickCount(); for (n = 0; n < c; n++) @@ -45,7 +45,7 @@ void DoTimeTest(DibBitmap *pbm) HostMessageBox("%ld count %ld ticks", c, lEnd - lStart); delete ptbm; - ptbm = CreateTBitmap("srtest2.tbm"); + ptbm = CreateTBitmap("srtest2.png"); lStart = HostGetTickCount(); for (n = 0; n < c; n++) ptbm->BltTo(pbm, 10, 10); @@ -53,7 +53,7 @@ void DoTimeTest(DibBitmap *pbm) HostMessageBox("%ld count %ld ticks", c, lEnd - lStart); delete ptbm; - ptbm = CreateTBitmap("sri_jog_0_0.tbm"); + ptbm = CreateTBitmap("sri_jog_0_0.png"); lStart = HostGetTickCount(); for (n = 0; n < c; n++) ptbm->BltTo(pbm, 10, 10); @@ -73,7 +73,7 @@ void DoTimeTest(DibBitmap *pbm) #if 0 FileMap fmap; - BitmapHeader *pbmh = (BitmapHeader *)MapFile("sri_fire_5_1.tbm", &fmap); + BitmapHeader *pbmh = (BitmapHeader *)MapFile("sri_fire_5_1.png", &fmap); byte *pbDst = pbm->GetBits() + 160 * 15; lStart = HostGetTickCount(); for (n = 0; n < c; n++) @@ -104,7 +104,7 @@ void TestTBitmap(DibBitmap *pbm) #if 1 if (ptbmTest == NULL) { - ptbmTest = CreateTBitmap("sri_stand_4_0.tbm"); + ptbmTest = CreateTBitmap("sri_stand_4_0.png"); if (ptbmTest == NULL) return; gxTest = 11; @@ -158,4 +158,4 @@ void TestTBitmap(DibBitmap *pbm) #endif #endif -} // namespace wi \ No newline at end of file +} // namespace wi