author | Wuzzy <Wuzzy2@mail.ru> |
Thu, 15 Mar 2018 15:49:17 +0100 | |
changeset 13224 | b229b3259a76 |
parent 13090 | 26173dd0c606 |
child 13242 | 0171519e2f13 |
permissions | -rw-r--r-- |
4 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
4 | 4 |
* |
183 | 5 |
* This program is free software; you can redistribute it and/or modify |
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
4 | 8 |
* |
183 | 9 |
* This program is distributed in the hope that it will be useful, |
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
4 | 13 |
* |
183 | 14 |
* You should have received a copy of the GNU General Public License |
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10104
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
4 | 17 |
*) |
18 |
||
2623 | 19 |
{$INCLUDE "options.inc"} |
4850 | 20 |
{$IF GLunit = GL}{$DEFINE GLunit:=GL,GLext}{$ENDIF} |
2623 | 21 |
|
4 | 22 |
unit uStore; |
23 |
interface |
|
7043
7c080e5ac8d0
Some work to make more units compile after conversion to c
unc0rr
parents:
7028
diff
changeset
|
24 |
uses SysUtils, uConsts, SDLh, GLunit, uTypes, uLandTexture, uCaptions, uChat; |
3692 | 25 |
|
3038 | 26 |
procedure initModule; |
27 |
procedure freeModule; |
|
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2705
diff
changeset
|
28 |
|
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
29 |
procedure LoadFonts(); |
6986
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
30 |
procedure StoreLoad(reload: boolean); |
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
31 |
procedure StoreRelease(reload: boolean); |
4 | 32 |
procedure RenderHealth(var Hedgehog: THedgehog); |
9656 | 33 |
function makeHealthBarTexture(w, h, Color: Longword): PTexture; |
4 | 34 |
procedure AddProgress; |
510 | 35 |
procedure FinishProgress; |
2905 | 36 |
function LoadImage(const filename: shortstring; imageFlags: LongInt): PSDL_Surface; |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
37 |
|
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
38 |
// loads an image from the games data files |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
39 |
function LoadDataImage(const path: TPathType; const filename: shortstring; imageFlags: LongInt): PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
40 |
// like LoadDataImage but uses altPath as fallback-path if file not found/loadable in path |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
41 |
function LoadDataImageAltPath(const path, altPath: TPathType; const filename: shortstring; imageFlags: LongInt): PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
42 |
// like LoadDataImage but uses altFile as fallback-filename if file cannot be loaded |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
43 |
function LoadDataImageAltFile(const path: TPathType; const filename, altFile: shortstring; imageFlags: LongInt): PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
44 |
|
7754 | 45 |
procedure LoadHedgehogHat(var HH: THedgehog; newHat: shortstring); |
10262 | 46 |
procedure LoadHedgehogHat2(var HH: THedgehog; newHat: shortstring; allowSurfReuse: boolean); |
47 |
||
10302
ea0b0e2efd95
huh? me? nono, don't mind me. I'm just here to clean up.
sheepluva
parents:
10276
diff
changeset
|
48 |
procedure InitZoom(zoom: real); |
ea0b0e2efd95
huh? me? nono, don't mind me. I'm just here to clean up.
sheepluva
parents:
10276
diff
changeset
|
49 |
|
753 | 50 |
procedure SetupOpenGL; |
3394
47b51e22e670
Henek's patch - adds a column to ammoMenu and removes the F* column in iphone version
koda
parents:
3390
diff
changeset
|
51 |
function RenderHelpWindow(caption, subcaption, description, extra: ansistring; extracolor: LongInt; iconsurf: PSDL_Surface; iconrect: PSDL_Rect): PTexture; |
2747 | 52 |
procedure RenderWeaponTooltip(atype: TAmmoType); |
53 |
procedure ShowWeaponTooltip(x, y: LongInt); |
|
4889
f71e30eb1d37
Reset things using team colour on change in SetClanColor in lua. This routine had better have been worth it.
nemo
parents:
4874
diff
changeset
|
54 |
procedure MakeCrossHairs; |
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7198
diff
changeset
|
55 |
{$IFDEF USE_VIDEO_RECORDING} |
7180 | 56 |
procedure InitOffscreenOpenGL; |
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7198
diff
changeset
|
57 |
{$ENDIF} |
4 | 58 |
|
7049 | 59 |
procedure WarpMouse(x, y: Word); inline; |
7866
58d10edc5d21
apparently we are forced to use a (dummy) callback for glut 3.0 compatibility
koda
parents:
7754
diff
changeset
|
60 |
procedure SwapBuffers; {$IFDEF USE_VIDEO_RECORDING}cdecl{$ELSE}inline{$ENDIF}; |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
61 |
procedure SetSkyColor(r, g, b: real); |
7049 | 62 |
|
4 | 63 |
implementation |
10015 | 64 |
uses uMisc, uConsole, uVariables, uUtils, uTextures, uRender, uRenderUtils, |
13049
1df5b407f368
Fix quit menu showing incorrect key when using non-default bindings
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
65 |
uCommands, uPhysFSLayer, uDebug, uLocale, uInputHandler, adler32 |
11338 | 66 |
{$IFDEF USE_CONTEXT_RESTORE}, uWorld{$ENDIF}; |
4 | 67 |
|
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
68 |
//type TGPUVendor = (gvUnknown, gvNVIDIA, gvATI, gvIntel, gvApple); |
2568
e654cbfb23ba
Bunch of neat stuff by Smaxx. ATI check, translucent name tags to reduce terrain fail, disabling health crates on invulnerable hogs. Also tweaks to prior stuff.
nemo
parents:
2567
diff
changeset
|
69 |
|
11342 | 70 |
var |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
71 |
squaresize : LongInt; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
72 |
numsquares : LongInt; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
73 |
ProgrTex: PTexture; |
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
74 |
LoadingText: PTexture; |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
75 |
|
10262 | 76 |
prevHat: shortstring; |
77 |
tmpHatSurf: PSDL_Surface; |
|
78 |
||
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
79 |
const |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
80 |
cHHFileName = 'Hedgehog'; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
81 |
cCHFileName = 'Crosshair'; |
4 | 82 |
|
10262 | 83 |
procedure freeTmpHatSurf(); |
84 |
begin |
|
85 |
if tmpHatSurf = nil then exit; |
|
86 |
SDL_FreeSurface(tmpHatSurf); |
|
87 |
tmpHatSurf:= nil; |
|
88 |
prevHat:= 'NoHat'; |
|
89 |
end; |
|
7188
580cd247511e
Removed leftover FFP code: We should now be GL2 GLSL1.30+ forward compatible.
Wolfgang Steffens <WolfgangSteff@gmail.com>
parents:
7186
diff
changeset
|
90 |
|
10302
ea0b0e2efd95
huh? me? nono, don't mind me. I'm just here to clean up.
sheepluva
parents:
10276
diff
changeset
|
91 |
procedure InitZoom(zoom: real); |
ea0b0e2efd95
huh? me? nono, don't mind me. I'm just here to clean up.
sheepluva
parents:
10276
diff
changeset
|
92 |
begin |
ea0b0e2efd95
huh? me? nono, don't mind me. I'm just here to clean up.
sheepluva
parents:
10276
diff
changeset
|
93 |
SetScale(zoom); |
10644
3b8290381fcb
make sure view limits are updated at start of game
sheepluva
parents:
10640
diff
changeset
|
94 |
// make sure view limits are updated |
3b8290381fcb
make sure view limits are updated at start of game
sheepluva
parents:
10640
diff
changeset
|
95 |
// because SetScale() doesn't do it, if zoom=cScaleFactor |
3b8290381fcb
make sure view limits are updated at start of game
sheepluva
parents:
10640
diff
changeset
|
96 |
updateViewLimits(); |
10302
ea0b0e2efd95
huh? me? nono, don't mind me. I'm just here to clean up.
sheepluva
parents:
10276
diff
changeset
|
97 |
end; |
7188
580cd247511e
Removed leftover FFP code: We should now be GL2 GLSL1.30+ forward compatible.
Wolfgang Steffens <WolfgangSteff@gmail.com>
parents:
7186
diff
changeset
|
98 |
|
10102 | 99 |
function WriteInRect(Surface: PSDL_Surface; X, Y: LongInt; Color: LongWord; Font: THWFont; s: PChar): TSDL_Rect; |
2747 | 100 |
var w, h: LongInt; |
101 |
tmpsurf: PSDL_Surface; |
|
102 |
clr: TSDL_Color; |
|
103 |
finalRect: TSDL_Rect; |
|
104 |
begin |
|
3407 | 105 |
w:= 0; h:= 0; // avoid compiler hints |
10102 | 106 |
TTF_SizeUTF8(Fontz[Font].Handle, s, @w, @h); |
6982 | 107 |
finalRect.x:= X + cFontBorder + 2; |
108 |
finalRect.y:= Y + cFontBorder; |
|
109 |
finalRect.w:= w + cFontBorder * 2 + 4; |
|
110 |
finalRect.h:= h + cFontBorder * 2; |
|
2747 | 111 |
clr.r:= Color shr 16; |
112 |
clr.g:= (Color shr 8) and $FF; |
|
113 |
clr.b:= Color and $FF; |
|
10102 | 114 |
tmpsurf:= TTF_RenderUTF8_Blended(Fontz[Font].Handle, s, clr); |
11512 | 115 |
if tmpsurf = nil then exit; |
2747 | 116 |
tmpsurf:= doSurfaceConversion(tmpsurf); |
11512 | 117 |
|
118 |
if tmpsurf <> nil then |
|
119 |
begin |
|
120 |
SDL_UpperBlit(tmpsurf, nil, Surface, @finalRect); |
|
121 |
SDL_FreeSurface(tmpsurf); |
|
122 |
finalRect.x:= X; |
|
123 |
finalRect.y:= Y; |
|
124 |
finalRect.w:= w + cFontBorder * 2 + 4; |
|
125 |
finalRect.h:= h + cFontBorder * 2; |
|
126 |
end; |
|
127 |
||
2747 | 128 |
WriteInRect:= finalRect |
129 |
end; |
|
130 |
||
4889
f71e30eb1d37
Reset things using team colour on change in SetClanColor in lua. This routine had better have been worth it.
nemo
parents:
4874
diff
changeset
|
131 |
procedure MakeCrossHairs; |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
132 |
var tmpsurf: PSDL_Surface; |
4889
f71e30eb1d37
Reset things using team colour on change in SetClanColor in lua. This routine had better have been worth it.
nemo
parents:
4874
diff
changeset
|
133 |
begin |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
134 |
tmpsurf:= LoadDataImage(ptGraphics, cCHFileName, ifAlpha or ifCritical); |
4889
f71e30eb1d37
Reset things using team colour on change in SetClanColor in lua. This routine had better have been worth it.
nemo
parents:
4874
diff
changeset
|
135 |
|
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
136 |
CrosshairTexture:= Surface2Tex(tmpsurf, false); |
4889
f71e30eb1d37
Reset things using team colour on change in SetClanColor in lua. This routine had better have been worth it.
nemo
parents:
4874
diff
changeset
|
137 |
|
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
138 |
SDL_FreeSurface(tmpsurf) |
4889
f71e30eb1d37
Reset things using team colour on change in SetClanColor in lua. This routine had better have been worth it.
nemo
parents:
4874
diff
changeset
|
139 |
end; |
f71e30eb1d37
Reset things using team colour on change in SetClanColor in lua. This routine had better have been worth it.
nemo
parents:
4874
diff
changeset
|
140 |
|
9656 | 141 |
function makeHealthBarTexture(w, h, Color: Longword): PTexture; |
142 |
var |
|
143 |
rr: TSDL_Rect; |
|
144 |
texsurf: PSDL_Surface; |
|
145 |
begin |
|
146 |
rr.x:= 0; |
|
147 |
rr.y:= 0; |
|
148 |
rr.w:= w; |
|
149 |
rr.h:= h; |
|
150 |
||
151 |
texsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, RMask, GMask, BMask, AMask); |
|
11537 | 152 |
if not checkFails(texsurf <> nil, errmsgCreateSurface, true) then |
12596 | 153 |
checkFails(SDL_SetColorKey(texsurf, SDL_TRUE, 0) = 0, errmsgTransparentSet, true); |
11537 | 154 |
|
155 |
if not allOK then exit(nil); |
|
9656 | 156 |
|
157 |
DrawRoundRect(@rr, cWhiteColor, cNearBlackColor, texsurf, true); |
|
158 |
||
159 |
rr.x:= 2; |
|
160 |
rr.y:= 2; |
|
161 |
rr.w:= w - 4; |
|
162 |
rr.h:= h - 4; |
|
163 |
||
164 |
DrawRoundRect(@rr, Color, Color, texsurf, false); |
|
165 |
makeHealthBarTexture:= Surface2Tex(texsurf, false); |
|
166 |
SDL_FreeSurface(texsurf); |
|
167 |
end; |
|
4 | 168 |
|
6492 | 169 |
procedure WriteNames(Font: THWFont); |
170 |
var t: LongInt; |
|
7495 | 171 |
i, maxLevel: LongInt; |
9656 | 172 |
r: TSDL_Rect; |
6492 | 173 |
drY: LongInt; |
174 |
texsurf, flagsurf, iconsurf: PSDL_Surface; |
|
7495 | 175 |
foundBot: boolean; |
9773 | 176 |
year, month, md : word; |
6492 | 177 |
begin |
10139 | 178 |
if cOnlyStats then exit; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
179 |
r.x:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
180 |
r.y:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
181 |
drY:= - 4; |
9954 | 182 |
{$IFNDEF PAS2C} |
9773 | 183 |
DecodeDate(Date, year, month, md); |
9954 | 184 |
{$ELSE} |
185 |
year:= 0; |
|
186 |
month:= 0; |
|
187 |
md:= 0; |
|
188 |
{$ENDIF} |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
189 |
for t:= 0 to Pred(TeamsCount) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
190 |
with TeamsArray[t]^ do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
191 |
begin |
13090
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
192 |
if ExtDriven then |
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
193 |
NameTagTex:= RenderStringTexLim(ansistring(TeamName), Clan^.Color, Font, cTeamHealthWidth) |
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
194 |
else NameTagTex:= RenderStringTex(ansistring(TeamName), Clan^.Color, Font); |
9791
446e4919b738
Display team owner in teams widget (addresses issue 174)
unc0rr
parents:
9774
diff
changeset
|
195 |
if length(Owner) > 0 then |
13090
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
196 |
if ExtDriven then |
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
197 |
OwnerTex:= RenderStringTexLim(ansistring(Owner), Clan^.Color, Font, cTeamHealthWidth) |
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
198 |
else OwnerTex:= RenderStringTex(ansistring(Owner), Clan^.Color, Font); |
690 | 199 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
200 |
r.x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
201 |
r.y:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
202 |
r.w:= 32; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
203 |
r.h:= 32; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
204 |
texsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, r.w, r.h, 32, RMask, GMask, BMask, AMask); |
11537 | 205 |
if not checkFails(texsurf <> nil, errmsgCreateSurface, true) then |
12596 | 206 |
checkFails(SDL_SetColorKey(texsurf, SDL_TRUE, 0) = 0, errmsgTransparentSet, true); |
11537 | 207 |
if not allOK then exit; |
2747 | 208 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
209 |
r.w:= 26; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
210 |
r.h:= 19; |
2747 | 211 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
212 |
DrawRoundRect(@r, cWhiteColor, cNearBlackColor, texsurf, true); |
3697 | 213 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
214 |
// overwrite flag for cpu teams and keep players from using it |
7495 | 215 |
foundBot:= false; |
216 |
maxLevel:= -1; |
|
217 |
for i:= 0 to cMaxHHIndex do |
|
218 |
with Hedgehogs[i] do |
|
219 |
if (Gear <> nil) and (BotLevel > 0) then |
|
220 |
begin |
|
221 |
foundBot:= true; |
|
222 |
// initially was going to do the highest botlevel of the team, but for now, just apply if entire team has same bot level |
|
223 |
if maxLevel = -1 then maxLevel:= BotLevel |
|
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
224 |
else if (maxLevel > 0) and (maxLevel <> BotLevel) then maxLevel:= 0; |
7495 | 225 |
//if (maxLevel > 0) and (BotLevel < maxLevel) then maxLevel:= BotLevel |
226 |
end |
|
227 |
else if Gear <> nil then maxLevel:= 0; |
|
228 |
||
229 |
if foundBot then |
|
230 |
begin |
|
231 |
// disabled the plain flag - I think it looks ok even w/ full bars obscuring CPU |
|
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
232 |
//if (maxLevel > 0) and (maxLevel < 3) then Flag:= 'cpu_plain' else |
7495 | 233 |
Flag:= 'cpu' |
234 |
end |
|
235 |
else if (Flag = 'cpu') or (Flag = 'cpu_plain') then |
|
236 |
Flag:= 'hedgewars'; |
|
3697 | 237 |
|
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
238 |
flagsurf:= LoadDataImageAltFile(ptFlags, Flag, 'hedgewars', ifNone); |
11537 | 239 |
if not checkFails(flagsurf <> nil, 'Failed to load flag "' + Flag + '" as well as the default flag', true) then |
240 |
begin |
|
241 |
case maxLevel of |
|
242 |
1: copyToXY(SpritesData[sprBotlevels].Surface, flagsurf, 0, 0); |
|
243 |
2: copyToXYFromRect(SpritesData[sprBotlevels].Surface, flagsurf, 5, 2, 17, 13, 5, 2); |
|
244 |
3: copyToXYFromRect(SpritesData[sprBotlevels].Surface, flagsurf, 9, 5, 13, 10, 9, 5); |
|
245 |
4: copyToXYFromRect(SpritesData[sprBotlevels].Surface, flagsurf, 13, 9, 9, 6, 13, 9); |
|
246 |
5: copyToXYFromRect(SpritesData[sprBotlevels].Surface, flagsurf, 17, 11, 5, 4, 17, 11) |
|
247 |
end; |
|
7495 | 248 |
|
11537 | 249 |
copyToXY(flagsurf, texsurf, 2, 2); |
250 |
SDL_FreeSurface(flagsurf); |
|
251 |
flagsurf:= nil; |
|
252 |
end; |
|
7495 | 253 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
254 |
// restore black border pixels inside the flag |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
255 |
PLongwordArray(texsurf^.pixels)^[32 * 2 + 2]:= cNearBlackColor; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
256 |
PLongwordArray(texsurf^.pixels)^[32 * 2 + 23]:= cNearBlackColor; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
257 |
PLongwordArray(texsurf^.pixels)^[32 * 16 + 2]:= cNearBlackColor; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
258 |
PLongwordArray(texsurf^.pixels)^[32 * 16 + 23]:= cNearBlackColor; |
2747 | 259 |
|
7495 | 260 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
261 |
FlagTex:= Surface2Tex(texsurf, false); |
3041 | 262 |
SDL_FreeSurface(texsurf); |
4874 | 263 |
texsurf:= nil; |
3041 | 264 |
|
11537 | 265 |
if not allOK then exit; |
266 |
||
10127 | 267 |
AIKillsTex := RenderStringTex(ansistring(inttostr(stats.AIKills)), Clan^.Color, fnt16); |
13023
0248cf0da834
Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents:
12925
diff
changeset
|
268 |
LuaTeamValueTex := RenderStringTex(LuaTeamValue, Clan^.Color, fnt16); |
3773 | 269 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
270 |
dec(drY, r.h + 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
271 |
DrawHealthY:= drY; |
7495 | 272 |
for i:= 0 to cMaxHHIndex do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
273 |
with Hedgehogs[i] do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
274 |
if Gear <> nil then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
275 |
begin |
13090
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
276 |
if ExtDriven then |
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
277 |
NameTagTex:= RenderStringTexLim(ansistring(Name), Clan^.Color, fnt16, cTeamHealthWidth) |
26173dd0c606
the clipping was just due to remote abuse anyway - this addresses a couple of the concerns from the bug
nemo
parents:
13049
diff
changeset
|
278 |
else NameTagTex:= RenderStringTex(ansistring(Name), Clan^.Color, fnt16); |
9773 | 279 |
if Hat = 'NoHat' then |
280 |
begin |
|
9807 | 281 |
if (month = 4) and (md = 20) then |
282 |
Hat := 'eastertop' // Easter |
|
9938 | 283 |
else if (month = 12) and ((md = 24) or (md = 25) or (md = 26)) then |
284 |
Hat := 'Santa' // Christmas Eve/Christmas/Boxing Day |
|
9807 | 285 |
else if (month = 10) and (md = 31) then |
9773 | 286 |
Hat := 'fr_pumpkin'; // Halloween/Hedgewars' birthday |
287 |
end; |
|
10526
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10510
diff
changeset
|
288 |
if (month = 4) and (md = 1) then |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10510
diff
changeset
|
289 |
begin |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10510
diff
changeset
|
290 |
AprilOne:= true; |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10510
diff
changeset
|
291 |
Hat := 'fr_tomato'; // avoid promoting violence to hedgehogs. see http://hedgewars.org/node/5818 |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10510
diff
changeset
|
292 |
end; |
10015 | 293 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
294 |
if Hat <> 'NoHat' then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
295 |
begin |
2874
3c7c2bf1ba38
A simple hat reservation mechanism. Can be worked around with a little effort, but to make it useful, you'd have to get everyone you played with to work around it too. Quite a bit of effort for a small reward feature.
nemo
parents:
2873
diff
changeset
|
296 |
if (Length(Hat) > 39) and (Copy(Hat,1,8) = 'Reserved') and (Copy(Hat,9,32) = PlayerHash) then |
10262 | 297 |
LoadHedgehogHat2(Hedgehogs[i], 'Reserved/' + Copy(Hat,9,Length(Hat)-8), true) |
2874
3c7c2bf1ba38
A simple hat reservation mechanism. Can be worked around with a little effort, but to make it useful, you'd have to get everyone you played with to work around it too. Quite a bit of effort for a small reward feature.
nemo
parents:
2873
diff
changeset
|
298 |
else |
10262 | 299 |
LoadHedgehogHat2(Hedgehogs[i], Hat, true); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
300 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
301 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
302 |
end; |
10262 | 303 |
|
304 |
freeTmpHatSurf(); |
|
305 |
||
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
306 |
MissionIcons:= LoadDataImage(ptGraphics, 'missions', ifCritical); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
307 |
iconsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, 28, 28, 32, RMask, GMask, BMask, AMask); |
3862 | 308 |
if iconsurf <> nil then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
309 |
begin |
3862 | 310 |
r.x:= 0; |
311 |
r.y:= 0; |
|
312 |
r.w:= 28; |
|
313 |
r.h:= 28; |
|
314 |
DrawRoundRect(@r, cWhiteColor, cNearBlackColor, iconsurf, true); |
|
315 |
ropeIconTex:= Surface2Tex(iconsurf, false); |
|
316 |
SDL_FreeSurface(iconsurf); |
|
317 |
iconsurf:= nil; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
318 |
end; |
9656 | 319 |
|
320 |
||
321 |
for t:= 0 to Pred(ClansCount) do |
|
322 |
with ClansArray[t]^ do |
|
323 |
HealthTex:= makeHealthBarTexture(cTeamHealthWidth + 5, Teams[0]^.NameTagTex^.h, Color); |
|
324 |
||
325 |
GenericHealthTexture:= makeHealthBarTexture(cTeamHealthWidth + 5, TeamsArray[0]^.NameTagTex^.h, cWhiteColor) |
|
6492 | 326 |
end; |
4 | 327 |
|
9656 | 328 |
|
6492 | 329 |
procedure InitHealth; |
330 |
var i, t: LongInt; |
|
331 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
332 |
for t:= 0 to Pred(TeamsCount) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
333 |
if TeamsArray[t] <> nil then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
334 |
with TeamsArray[t]^ do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
335 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
336 |
for i:= 0 to cMaxHHIndex do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
337 |
if Hedgehogs[i].Gear <> nil then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
338 |
RenderHealth(Hedgehogs[i]); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
339 |
end |
6492 | 340 |
end; |
4 | 341 |
|
6492 | 342 |
procedure LoadGraves; |
343 |
var t: LongInt; |
|
344 |
texsurf: PSDL_Surface; |
|
345 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
346 |
for t:= 0 to Pred(TeamsCount) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
347 |
if TeamsArray[t] <> nil then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
348 |
with TeamsArray[t]^ do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
349 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
350 |
if GraveName = '' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
351 |
GraveName:= 'Statue'; |
12597 | 352 |
texsurf:= LoadDataImageAltFile(ptGraves, GraveName, 'Statue', ifCritical or ifColorKey); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
353 |
GraveTex:= Surface2Tex(texsurf, false); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
354 |
SDL_FreeSurface(texsurf) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
355 |
end |
6492 | 356 |
end; |
4 | 357 |
|
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
358 |
procedure LoadFonts(); |
6492 | 359 |
var s: shortstring; |
844 | 360 |
fi: THWFont; |
4 | 361 |
begin |
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
362 |
AddFileLog('LoadFonts();'); |
5714 | 363 |
|
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
364 |
if (not cOnlyStats) then |
5714 | 365 |
for fi:= Low(THWFont) to High(THWFont) do |
366 |
with Fontz[fi] do |
|
367 |
begin |
|
8025 | 368 |
s:= cPathz[ptFonts] + '/' + Name; |
5714 | 369 |
WriteToConsole(msgLoading + s + ' (' + inttostr(Height) + 'pt)... '); |
8028 | 370 |
Handle:= TTF_OpenFontRW(rwopsOpenRead(s), true, Height); |
11512 | 371 |
if SDLCheck(Handle <> nil, 'TTF_OpenFontRW', true) then exit; |
5714 | 372 |
TTF_SetFontStyle(Handle, style); |
373 |
WriteLnToConsole(msgOK) |
|
374 |
end; |
|
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
375 |
end; |
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
376 |
|
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
377 |
procedure StoreLoad(reload: boolean); |
12626 | 378 |
var ii: TSprite; |
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
379 |
ai: TAmmoType; |
12329 | 380 |
tmpsurf, tmpoverlay: PSDL_Surface; |
12716
20dbb3a03e61
extend land digest to all surfaces that could possibly be loaded into Land[] - i.e. ones that impact sync
nemo
parents:
12706
diff
changeset
|
381 |
i, y, imflags: LongInt; |
13049
1df5b407f368
Fix quit menu showing incorrect key when using non-default bindings
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
382 |
keyConfirm, keyQuit: ansistring; |
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
383 |
begin |
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
384 |
AddFileLog('StoreLoad()'); |
53 | 385 |
|
10510 | 386 |
if not cOnlyStats then |
10139 | 387 |
begin |
388 |
MakeCrossHairs; |
|
389 |
LoadGraves; |
|
11100
c348a8afff6e
- Resolves problem with wrong path to chef hat on iOS
antonc27 <antonc27@mail.ru>
parents:
11086
diff
changeset
|
390 |
{$IFDEF IPHONEOS} |
c348a8afff6e
- Resolves problem with wrong path to chef hat on iOS
antonc27 <antonc27@mail.ru>
parents:
11086
diff
changeset
|
391 |
tmpHatSurf:= LoadDataImage(ptHats, 'chef', ifNone); |
c348a8afff6e
- Resolves problem with wrong path to chef hat on iOS
antonc27 <antonc27@mail.ru>
parents:
11086
diff
changeset
|
392 |
{$ELSE} |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10309
diff
changeset
|
393 |
tmpHatSurf:= LoadDataImage(ptHats, 'Reserved/chef', ifNone); |
11100
c348a8afff6e
- Resolves problem with wrong path to chef hat on iOS
antonc27 <antonc27@mail.ru>
parents:
11086
diff
changeset
|
394 |
{$ENDIF} |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10309
diff
changeset
|
395 |
ChefHatTexture:= Surface2Tex(tmpHatSurf, true); |
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10309
diff
changeset
|
396 |
freeTmpHatSurf(); |
10139 | 397 |
end; |
10510 | 398 |
|
6394
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
399 |
if not reload then |
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
400 |
AddProgress; |
4 | 401 |
|
402 |
for ii:= Low(TSprite) to High(TSprite) do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
403 |
with SpritesData[ii] do |
5215
d4c529624460
Try and avoid problem reported by users like RDChrisco with cards that only support 512 texture size, and disable backgrounds. Also, reorganise the rq flags sprite loading a bit. Needs testing to make sure it matches the sprite uses. It should though.
nemo
parents:
5187
diff
changeset
|
404 |
// FIXME - add a sprite attribute to match on rq flags? |
d4c529624460
Try and avoid problem reported by users like RDChrisco with cards that only support 512 texture size, and disable backgrounds. Also, reorganise the rq flags sprite loading a bit. Needs testing to make sure it matches the sprite uses. It should though.
nemo
parents:
5187
diff
changeset
|
405 |
if (((cReducedQuality and (rqNoBackground or rqLowRes)) = 0) or // why rqLowRes? |
10139 | 406 |
(not (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR]))) |
10510 | 407 |
and (((cReducedQuality and rqPlainSplash) = 0) or ((not (ii in [sprSplash, sprDroplet, sprSDSplash, sprSDDroplet])))) |
10139 | 408 |
and (((cReducedQuality and rqKillFlakes) = 0) or cSnow or ((not (ii in [sprFlake, sprSDFlake])))) |
409 |
and ((cCloudsNumber > 0) or (ii <> sprCloud)) |
|
10510 | 410 |
and ((vobCount > 0) or (ii <> sprFlake)) |
10139 | 411 |
and (savesurf or (not cOnlyStats)) // in stats-only only load those which are needed later |
11544 | 412 |
and allOK |
10139 | 413 |
then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
414 |
begin |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
415 |
if reload then |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
416 |
tmpsurf:= Surface |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
417 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
418 |
begin |
12597 | 419 |
imflags := (ifAlpha or ifColorKey); |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
420 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
421 |
// these sprites are optional |
12706
79e13080b9db
mark up sprites for uStore loading. critical is for ones needed for proper gameplay, checksum is for ones where the game will desync if they don't match. will add checksumming next...
nemo
parents:
12626
diff
changeset
|
422 |
if critical then |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
423 |
imflags := (imflags or ifCritical); |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
424 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
425 |
// load the image |
12770
d01e9dd5c439
checksum immediately after loading because surface2tex does surface manipulation. also add some FIXMEs
nemo
parents:
12764
diff
changeset
|
426 |
tmpsurf := LoadDataImageAltPath(Path, AltPath, FileName, imflags); |
d01e9dd5c439
checksum immediately after loading because surface2tex does surface manipulation. also add some FIXMEs
nemo
parents:
12764
diff
changeset
|
427 |
if (tmpsurf <> nil) and checkSum then |
d01e9dd5c439
checksum immediately after loading because surface2tex does surface manipulation. also add some FIXMEs
nemo
parents:
12764
diff
changeset
|
428 |
for y := 0 to tmpsurf^.h-1 do |
d01e9dd5c439
checksum immediately after loading because surface2tex does surface manipulation. also add some FIXMEs
nemo
parents:
12764
diff
changeset
|
429 |
syncedPixelDigest:= Adler32Update(syncedPixelDigest, @PByteArray(tmpsurf^.pixels)^[y*tmpsurf^.pitch], tmpsurf^.w*4) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
430 |
end; |
2426 | 431 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
432 |
if tmpsurf <> nil then |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
433 |
begin |
3558 | 434 |
if getImageDimensions then |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
435 |
begin |
3558 | 436 |
imageWidth:= tmpsurf^.w; |
437 |
imageHeight:= tmpsurf^.h |
|
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
438 |
end; |
3558 | 439 |
if getDimensions then |
12194 | 440 |
if Height = -1 then //BlueWater |
441 |
begin |
|
442 |
Width:= tmpsurf^.w; |
|
443 |
Height:= tmpsurf^.h div watFrames; |
|
444 |
end |
|
445 |
else if Height = -2 then //SDWater |
|
446 |
begin |
|
447 |
Width:= tmpsurf^.w; |
|
448 |
Height:= tmpsurf^.h div watSDFrames; |
|
449 |
end |
|
450 |
else |
|
451 |
begin |
|
452 |
Width:= tmpsurf^.w; |
|
453 |
Height:= tmpsurf^.h |
|
454 |
end; |
|
12329 | 455 |
if (ii in [sprAMAmmos, sprAMAmmosBW]) then |
456 |
begin |
|
12601
c9711561f947
fix some things that annoy pas2c and whitespaces
sheepluva
parents:
12597
diff
changeset
|
457 |
tmpoverlay := LoadDataImage(Path, copy(FileName, 1, length(FileName)-5), (imflags and (not ifCritical))); |
12329 | 458 |
if tmpoverlay <> nil then |
459 |
begin |
|
460 |
copyToXY(tmpoverlay, tmpsurf, 0, 0); |
|
461 |
SDL_FreeSurface(tmpoverlay) |
|
462 |
end |
|
463 |
end; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
464 |
if (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR]) then |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
465 |
begin |
3537
8f5b3108f29c
New approach to the low-res problem. Basically, we already have a 1024 minimum, and the tallest maps are restricting themselves to 2048 maximum. All backgrounds are scaled down 50%, then scaled up on draw. Saves memory, and backgrounds are already deliberately fuzzed for depth of field anyway.
nemo
parents:
3525
diff
changeset
|
466 |
Texture:= Surface2Tex(tmpsurf, true); |
8f5b3108f29c
New approach to the low-res problem. Basically, we already have a 1024 minimum, and the tallest maps are restricting themselves to 2048 maximum. All backgrounds are scaled down 50%, then scaled up on draw. Saves memory, and backgrounds are already deliberately fuzzed for depth of field anyway.
nemo
parents:
3525
diff
changeset
|
467 |
Texture^.Scale:= 2 |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
468 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
469 |
else |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
470 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
471 |
Texture:= Surface2Tex(tmpsurf, false); |
4809
9c7d5f802618
rearrange quality flags a little, disable snow rendering on rqLowRes
koda
parents:
4782
diff
changeset
|
472 |
// HACK: We should include some sprite attribute to define the texture wrap directions |
9c7d5f802618
rearrange quality flags a little, disable snow rendering on rqLowRes
koda
parents:
4782
diff
changeset
|
473 |
if ((ii = sprWater) or (ii = sprSDWater)) and ((cReducedQuality and (rq2DWater or rqClampLess)) = 0) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
474 |
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
475 |
end; |
3491 | 476 |
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, priority); |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
477 |
// This should maybe be flagged. It wastes quite a bit of memory. |
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
478 |
if not reload then |
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
479 |
begin |
6674 | 480 |
{$IFDEF USE_CONTEXT_RESTORE} |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
481 |
Surface:= tmpsurf |
5714 | 482 |
{$ELSE} |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
483 |
if saveSurf then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
484 |
Surface:= tmpsurf |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
485 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
486 |
SDL_FreeSurface(tmpsurf) |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
487 |
{$ENDIF} |
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
488 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
489 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
490 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
491 |
Surface:= nil |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
492 |
end; |
80 | 493 |
|
11544 | 494 |
if (not cOnlyStats) and allOK then |
10139 | 495 |
begin |
496 |
WriteNames(fnt16); |
|
7495 | 497 |
|
10139 | 498 |
if not reload then |
499 |
AddProgress; |
|
500 |
||
12597 | 501 |
tmpsurf:= LoadDataImage(ptGraphics, cHHFileName, ifAlpha or ifCritical or ifColorKey); |
567 | 502 |
|
10139 | 503 |
HHTexture:= Surface2Tex(tmpsurf, false); |
504 |
SDL_FreeSurface(tmpsurf); |
|
505 |
||
506 |
InitHealth; |
|
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
507 |
|
10139 | 508 |
PauseTexture:= RenderStringTex(trmsg[sidPaused], cYellowColor, fntBig); |
509 |
AFKTexture:= RenderStringTex(trmsg[sidAFK], cYellowColor, fntBig); |
|
13049
1df5b407f368
Fix quit menu showing incorrect key when using non-default bindings
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
510 |
keyConfirm:= KeyBindToName('confirm'); |
1df5b407f368
Fix quit menu showing incorrect key when using non-default bindings
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
511 |
keyQuit:= KeyBindToName('quit'); |
1df5b407f368
Fix quit menu showing incorrect key when using non-default bindings
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
512 |
ConfirmTexture:= RenderStringTex(FormatA(trmsg[sidConfirm], [keyConfirm, keyQuit]), cYellowColor, fntBig); |
10139 | 513 |
SyncTexture:= RenderStringTex(trmsg[sidSync], cYellowColor, fntBig); |
4 | 514 |
|
10139 | 515 |
if not reload then |
516 |
AddProgress; |
|
2601 | 517 |
|
10139 | 518 |
// name of weapons in ammo menu |
519 |
for ai:= Low(TAmmoType) to High(TAmmoType) do |
|
520 |
with Ammoz[ai] do |
|
521 |
begin |
|
11537 | 522 |
if checkFails(length(trAmmo[NameId]) > 0,'No default text/translation found for ammo type #' + intToStr(ord(ai)) + '!',true) then exit; |
10139 | 523 |
tmpsurf:= TTF_RenderUTF8_Blended(Fontz[CheckCJKFont(trAmmo[NameId],fnt16)].Handle, PChar(trAmmo[NameId]), cWhiteColorChannels); |
11537 | 524 |
if checkFails(tmpsurf <> nil,'Name-texture creation for ammo type #' + intToStr(ord(ai)) + ' failed!',true) then exit; |
10139 | 525 |
tmpsurf:= doSurfaceConversion(tmpsurf); |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10626
diff
changeset
|
526 |
FreeAndNilTexture(NameTex); |
10139 | 527 |
NameTex:= Surface2Tex(tmpsurf, false); |
528 |
SDL_FreeSurface(tmpsurf) |
|
529 |
end; |
|
2601 | 530 |
|
10139 | 531 |
// number of weapons in ammo menu |
532 |
for i:= Low(CountTexz) to High(CountTexz) do |
|
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6379
diff
changeset
|
533 |
begin |
10139 | 534 |
tmpsurf:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(IntToStr(i) + 'x'), cWhiteColorChannels); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
535 |
tmpsurf:= doSurfaceConversion(tmpsurf); |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10626
diff
changeset
|
536 |
FreeAndNilTexture(CountTexz[i]); |
10139 | 537 |
CountTexz[i]:= Surface2Tex(tmpsurf, false); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
538 |
SDL_FreeSurface(tmpsurf) |
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6379
diff
changeset
|
539 |
end; |
2376 | 540 |
|
10139 | 541 |
if not reload then |
542 |
AddProgress; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
543 |
end; |
844 | 544 |
|
2669 | 545 |
IMG_Quit(); |
4 | 546 |
end; |
547 |
||
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
548 |
procedure StoreRelease(reload: boolean); |
4 | 549 |
var ii: TSprite; |
4901 | 550 |
ai: TAmmoType; |
551 |
i, t: LongInt; |
|
4 | 552 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
553 |
for ii:= Low(TSprite) to High(TSprite) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
554 |
begin |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
555 |
FreeAndNilTexture(SpritesData[ii].Texture); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
556 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
557 |
if (SpritesData[ii].Surface <> nil) and (not reload) then |
5562 | 558 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
559 |
SDL_FreeSurface(SpritesData[ii].Surface); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
560 |
SpritesData[ii].Surface:= nil |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
561 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
562 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
563 |
SDL_FreeSurface(MissionIcons); |
6394
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
564 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
565 |
// free the textures declared in uVariables |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10309
diff
changeset
|
566 |
FreeAndNilTexture(ChefHatTexture); |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
567 |
FreeAndNilTexture(CrosshairTexture); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
568 |
FreeAndNilTexture(WeaponTooltipTex); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
569 |
FreeAndNilTexture(PauseTexture); |
9670
1954f692e8c6
Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents:
9656
diff
changeset
|
570 |
FreeAndNilTexture(AFKTexture); |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
571 |
FreeAndNilTexture(SyncTexture); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
572 |
FreeAndNilTexture(ConfirmTexture); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
573 |
FreeAndNilTexture(ropeIconTex); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
574 |
FreeAndNilTexture(HHTexture); |
9656 | 575 |
FreeAndNilTexture(GenericHealthTexture); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
576 |
// free all ammo name textures |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
577 |
for ai:= Low(TAmmoType) to High(TAmmoType) do |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
578 |
FreeAndNilTexture(Ammoz[ai].NameTex); |
5562 | 579 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
580 |
// free all count textures |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
581 |
for i:= Low(CountTexz) to High(CountTexz) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
582 |
begin |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
583 |
FreeAndNilTexture(CountTexz[i]); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
584 |
CountTexz[i]:= nil |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
585 |
end; |
5562 | 586 |
|
9656 | 587 |
for t:= 0 to Pred(ClansCount) do |
588 |
begin |
|
589 |
if ClansArray[t] <> nil then |
|
590 |
FreeAndNilTexture(ClansArray[t]^.HealthTex); |
|
591 |
end; |
|
592 |
||
4901 | 593 |
// free all team and hedgehog textures |
594 |
for t:= 0 to Pred(TeamsCount) do |
|
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6379
diff
changeset
|
595 |
begin |
4901 | 596 |
if TeamsArray[t] <> nil then |
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6379
diff
changeset
|
597 |
begin |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
598 |
FreeAndNilTexture(TeamsArray[t]^.NameTagTex); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
599 |
FreeAndNilTexture(TeamsArray[t]^.GraveTex); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
600 |
FreeAndNilTexture(TeamsArray[t]^.AIKillsTex); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
601 |
FreeAndNilTexture(TeamsArray[t]^.FlagTex); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
602 |
|
4901 | 603 |
for i:= 0 to cMaxHHIndex do |
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6379
diff
changeset
|
604 |
begin |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
605 |
FreeAndNilTexture(TeamsArray[t]^.Hedgehogs[i].NameTagTex); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
606 |
FreeAndNilTexture(TeamsArray[t]^.Hedgehogs[i].HealthTagTex); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9530
diff
changeset
|
607 |
FreeAndNilTexture(TeamsArray[t]^.Hedgehogs[i].HatTex); |
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6379
diff
changeset
|
608 |
end; |
4901 | 609 |
end; |
610 |
end; |
|
10869 | 611 |
|
612 |
RendererCleanup(); |
|
4 | 613 |
end; |
614 |
||
2677
83ad68ceef72
Non-hacked version of CJK handling. Should switch to CJK rendering only if a particular string needs it, instead of based on locale file.
nemo
parents:
2674
diff
changeset
|
615 |
|
4 | 616 |
procedure RenderHealth(var Hedgehog: THedgehog); |
95 | 617 |
var s: shortstring; |
4 | 618 |
begin |
11827 | 619 |
s:= IntToStr(Hedgehog.Gear^.Health); |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10626
diff
changeset
|
620 |
FreeAndNilTexture(Hedgehog.HealthTagTex); |
10127 | 621 |
Hedgehog.HealthTagTex:= RenderStringTex(ansistring(s), Hedgehog.Team^.Clan^.Color, fnt16) |
4 | 622 |
end; |
623 |
||
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
624 |
function LoadImage(const filename: shortstring; imageFlags: LongInt): PSDL_Surface; |
30 | 625 |
var tmpsurf: PSDL_Surface; |
355 | 626 |
s: shortstring; |
10260
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
627 |
rwops: PSDL_RWops; |
4 | 628 |
begin |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
629 |
LoadImage:= nil; |
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
630 |
WriteToConsole(msgLoading + filename + '.png [flags: ' + inttostr(imageFlags) + '] '); |
2426 | 631 |
|
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
632 |
s:= filename + '.png'; |
10260
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
633 |
|
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
634 |
rwops:= nil; |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
635 |
tmpsurf:= nil; |
2254 | 636 |
|
10260
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
637 |
if pfsExists(s) then |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
638 |
begin |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
639 |
// get data source |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
640 |
rwops:= rwopsOpenRead(s); |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
641 |
|
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
642 |
// load image with SDL (with freesrc param set to true) |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
643 |
if rwops <> nil then |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
644 |
tmpsurf:= IMG_Load_RW(rwops, true); |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
645 |
end; |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
646 |
|
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
647 |
// loading failed |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
648 |
if tmpsurf = nil then |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8838
diff
changeset
|
649 |
begin |
10260
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
650 |
// output sdl error if loading failed when data source was available |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
651 |
if rwops <> nil then |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
652 |
begin |
10735 | 653 |
// anounce that loading failed |
654 |
OutError(msgFailed, false); |
|
655 |
||
11512 | 656 |
if SDLCheck(false, 'LoadImage', (imageFlags and ifCritical) <> 0) then exit; |
10260
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
657 |
// rwops was already freed by IMG_Load_RW |
25155aaede77
clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors
sheepluva
parents:
10229
diff
changeset
|
658 |
rwops:= nil; |
10735 | 659 |
end else |
660 |
OutError(msgFailed, (imageFlags and ifCritical) <> 0); |
|
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
661 |
exit; |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8838
diff
changeset
|
662 |
end; |
2153 | 663 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
664 |
if ((imageFlags and ifIgnoreCaps) = 0) and ((tmpsurf^.w > MaxTextureSize) or (tmpsurf^.h > MaxTextureSize)) then |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8838
diff
changeset
|
665 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
666 |
SDL_FreeSurface(tmpsurf); |
8039
a3b86c1f63b4
another tweak tomake --stats-only work on headless servers
Xeli
parents:
8027
diff
changeset
|
667 |
OutError(msgFailedSize, ((not cOnlyStats) and ((imageFlags and ifCritical) <> 0))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
668 |
// dummy surface to replace non-critical textures that failed to load due to their size |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
669 |
LoadImage:= SDL_CreateRGBSurface(SDL_SWSURFACE, 2, 2, 32, RMask, GMask, BMask, AMask); |
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
670 |
exit; |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8838
diff
changeset
|
671 |
end; |
351 | 672 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
673 |
tmpsurf:= doSurfaceConversion(tmpsurf); |
2630 | 674 |
|
12597 | 675 |
if (imageFlags and ifColorKey) <> 0 then |
12596 | 676 |
if checkFails(SDL_SetColorKey(tmpsurf, SDL_TRUE, 0) = 0, errmsgTransparentSet, true) then exit; |
2630 | 677 |
|
3407 | 678 |
WriteLnToConsole(msgOK + ' (' + inttostr(tmpsurf^.w) + 'x' + inttostr(tmpsurf^.h) + ')'); |
2630 | 679 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
680 |
LoadImage:= tmpsurf //Result |
753 | 681 |
end; |
682 |
||
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
683 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
684 |
function LoadDataImage(const path: TPathType; const filename: shortstring; imageFlags: LongInt): PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
685 |
var tmpsurf: PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
686 |
begin |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
687 |
// check for file in user dir (never critical) |
8022 | 688 |
tmpsurf:= LoadImage(cPathz[path] + '/' + filename, imageFlags); |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
689 |
|
8370 | 690 |
LoadDataImage:= tmpsurf; |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
691 |
end; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
692 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
693 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
694 |
function LoadDataImageAltPath(const path, altPath: TPathType; const filename: shortstring; imageFlags: LongInt): PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
695 |
var tmpsurf: PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
696 |
begin |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
697 |
// if there is no alternative path, just forward and return result |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
698 |
if (altPath = ptNone) then |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
699 |
exit(LoadDataImage(path, filename, imageFlags)); |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
700 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
701 |
// since we have a fallback path this search isn't critical yet |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
702 |
tmpsurf:= LoadDataImage(path, filename, imageFlags and (not ifCritical)); |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
703 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
704 |
// if image still not found try alternative path |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
705 |
if (tmpsurf = nil) then |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
706 |
tmpsurf:= LoadDataImage(altPath, filename, imageFlags); |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
707 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
708 |
LoadDataImageAltPath:= tmpsurf; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
709 |
end; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
710 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
711 |
function LoadDataImageAltFile(const path: TPathType; const filename, altFile: shortstring; imageFlags: LongInt): PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
712 |
var tmpsurf: PSDL_Surface; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
713 |
begin |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
714 |
// if there is no alternative filename, just forward and return result |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
715 |
if (altFile = '') then |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
716 |
exit(LoadDataImage(path, filename, imageFlags)); |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
717 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
718 |
// since we have a fallback filename this search isn't critical yet |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
719 |
tmpsurf:= LoadDataImage(path, filename, imageFlags and (not ifCritical)); |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
720 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
721 |
// if image still not found try alternative filename |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
722 |
if (tmpsurf = nil) then |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
723 |
tmpsurf:= LoadDataImage(path, altFile, imageFlags); |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
724 |
|
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
725 |
LoadDataImageAltFile:= tmpsurf; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
726 |
end; |
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7637
diff
changeset
|
727 |
|
7754 | 728 |
procedure LoadHedgehogHat(var HH: THedgehog; newHat: shortstring); |
10262 | 729 |
begin |
730 |
LoadHedgehogHat2(HH, newHat, false); |
|
731 |
end; |
|
732 |
||
733 |
procedure LoadHedgehogHat2(var HH: THedgehog; newHat: shortstring; allowSurfReuse: boolean); |
|
4874 | 734 |
begin |
9774 | 735 |
// free the mem of any previously assigned texture. This was previously only if the new one could be loaded, but, NoHat is usually a better choice |
736 |
if HH.HatTex <> nil then |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10626
diff
changeset
|
737 |
FreeAndNilTexture(HH.HatTex); |
10262 | 738 |
|
739 |
// load new hat surface if this hat is different than the one already loaded |
|
740 |
if newHat <> prevHat then |
|
9774 | 741 |
begin |
10262 | 742 |
freeTmpHatSurf(); |
743 |
tmpHatSurf:= LoadDataImage(ptHats, newHat, ifNone); |
|
9774 | 744 |
end; |
10262 | 745 |
|
7754 | 746 |
AddFileLog('Hat => '+newHat); |
4874 | 747 |
// only do something if the hat could be loaded |
10262 | 748 |
if tmpHatSurf <> nil then |
4874 | 749 |
begin |
7754 | 750 |
AddFileLog('Got Hat'); |
4874 | 751 |
|
752 |
// assign new hat to hedgehog |
|
10262 | 753 |
HH.HatTex:= Surface2Tex(tmpHatSurf, true); |
4874 | 754 |
|
10262 | 755 |
// remember that this hat was used last |
756 |
if allowSurfReuse then |
|
757 |
prevHat:= newHat |
|
4874 | 758 |
// cleanup: free temporary surface mem |
10262 | 759 |
else |
760 |
freeTmpHatSurf(); |
|
4874 | 761 |
end; |
2428 | 762 |
end; |
763 |
||
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
764 |
procedure SetupOpenGLAttributes; |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
765 |
begin |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
766 |
{$IFDEF IPHONEOS} |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
767 |
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0); |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
768 |
SDL_GL_SetAttribute(SDL_GL_RETAINED_BACKING, 1); |
11106
2953f858a196
- Actually fix for rendering on iOS ]:->
antonc27 <antonc27@mail.ru>
parents:
11100
diff
changeset
|
769 |
|
2953f858a196
- Actually fix for rendering on iOS ]:->
antonc27 <antonc27@mail.ru>
parents:
11100
diff
changeset
|
770 |
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1); |
2953f858a196
- Actually fix for rendering on iOS ]:->
antonc27 <antonc27@mail.ru>
parents:
11100
diff
changeset
|
771 |
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1); |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
772 |
{$ELSE} |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
773 |
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
774 |
{$ENDIF} |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
775 |
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
776 |
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 6); |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
777 |
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5); |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
778 |
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0); // no depth buffer |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
779 |
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0); // no alpha channel |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
780 |
SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, 16); // buffer should be 16 |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
781 |
SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1); // prefer hw rendering |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
782 |
end; |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
783 |
|
753 | 784 |
procedure SetupOpenGL; |
5505
a55aab592950
Ditch the renderer system in sdl1.3 and use the 'old fashioned' sdl/opengl context. This gives us more flexibility and less problem in receiving video events (expecially on mobile platform) as well as not having to care to reset the gl context every time sdl interferes.
koda
parents:
5285
diff
changeset
|
785 |
begin |
9530 | 786 |
AddFileLog('Setting up OpenGL (using driver: ' + shortstring(SDL_GetCurrentVideoDriver()) + ')'); |
6021 | 787 |
|
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
788 |
// TODO: this function creates an opengles1.1 context |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
789 |
// un-comment below and add proper logic to support opengles2.0 |
6885 | 790 |
//SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); |
791 |
//SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); |
|
6611 | 792 |
if SDLGLcontext = nil then |
793 |
SDLGLcontext:= SDL_GL_CreateContext(SDLwindow); |
|
11512 | 794 |
if SDLCheck(SDLGLcontext <> nil, 'SDLGLcontext', true) then exit; |
11413
55fc715435ea
- Workaround for problems with SDL_GL_SetSwapInterval on iOS
antonc27 <antonc27@mail.ru>
parents:
11378
diff
changeset
|
795 |
SDL_GL_SetSwapInterval(1); |
3405 | 796 |
|
10869 | 797 |
RendererSetup(); |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
798 |
|
11342 | 799 |
// gl2 init/matrix code was here, but removed |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2154
diff
changeset
|
800 |
end; |
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2154
diff
changeset
|
801 |
|
510 | 802 |
//////////////////////////////////////////////////////////////////////////////// |
803 |
procedure AddProgress; |
|
804 |
var r: TSDL_Rect; |
|
766 | 805 |
texsurf: PSDL_Surface; |
510 | 806 |
begin |
8027
e5ba3dd12531
make stats-only mode work headless. also skip a few things to save time/memory.
nemo
parents:
7866
diff
changeset
|
807 |
if cOnlyStats then exit; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
808 |
if Step = 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
809 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
810 |
WriteToConsole(msgLoading + 'progress sprite: '); |
12597 | 811 |
texsurf:= LoadDataImage(ptGraphics, 'Progress', ifCritical or ifColorKey); |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2705
diff
changeset
|
812 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
813 |
ProgrTex:= Surface2Tex(texsurf, false); |
3697 | 814 |
|
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
815 |
LoadingText:= RenderStringTex(trmsg[sidLoading], $FFF39EE8, fntBig); |
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
816 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
817 |
squaresize:= texsurf^.w shr 1; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
818 |
numsquares:= texsurf^.h div squaresize; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
819 |
SDL_FreeSurface(texsurf); |
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
820 |
|
8446
c18ba8726f5a
Fix sources so pas2c written in haskell could render them again
unc0rr
parents:
8444
diff
changeset
|
821 |
{$IFNDEF PAS2C} |
8204 | 822 |
with mobileRecord do |
823 |
if GameLoading <> nil then |
|
824 |
GameLoading(); |
|
8446
c18ba8726f5a
Fix sources so pas2c written in haskell could render them again
unc0rr
parents:
8444
diff
changeset
|
825 |
{$ENDIF} |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
826 |
end; |
1045 | 827 |
|
11537 | 828 |
if checkFails(ProgrTex <> nil, 'Error - Progress Texure is nil!', true) then exit; |
2284 | 829 |
|
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10302
diff
changeset
|
830 |
RenderClear(); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
831 |
if Step < numsquares then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
832 |
r.x:= 0 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
833 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
834 |
r.x:= squaresize; |
3697 | 835 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
836 |
r.y:= (Step mod numsquares) * squaresize; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
837 |
r.w:= squaresize; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
838 |
r.h:= squaresize; |
3697 | 839 |
|
6999 | 840 |
DrawTextureFromRect( -squaresize div 2, (cScreenHeight - squaresize) shr 1, @r, ProgrTex); |
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
841 |
DrawTexture( -LoadingText^.w div 2, (cScreenHeight - LoadingText^.h) shr 1 - (squaresize div 2) - (LoadingText^.h div 2) - 8, LoadingText); |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2705
diff
changeset
|
842 |
|
7049 | 843 |
SwapBuffers; |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7866
diff
changeset
|
844 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
845 |
inc(Step); |
510 | 846 |
end; |
847 |
||
848 |
procedure FinishProgress; |
|
849 |
begin |
|
8446
c18ba8726f5a
Fix sources so pas2c written in haskell could render them again
unc0rr
parents:
8444
diff
changeset
|
850 |
{$IFNDEF PAS2C} |
8204 | 851 |
with mobileRecord do |
852 |
if GameLoaded <> nil then |
|
853 |
GameLoaded(); |
|
8446
c18ba8726f5a
Fix sources so pas2c written in haskell could render them again
unc0rr
parents:
8444
diff
changeset
|
854 |
{$ENDIF} |
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
855 |
WriteLnToConsole('Freeing progress textures... '); |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10626
diff
changeset
|
856 |
FreeAndNilTexture(ProgrTex); |
12191
322aaad4a93d
Load screen: Move “LOADING” from image into text box
Wuzzy <almikes@aol.com>
parents:
12180
diff
changeset
|
857 |
FreeAndNilTexture(LoadingText); |
5714 | 858 |
Step:= 0 |
510 | 859 |
end; |
860 |
||
2905 | 861 |
function RenderHelpWindow(caption, subcaption, description, extra: ansistring; extracolor: LongInt; iconsurf: PSDL_Surface; iconrect: PSDL_Rect): PTexture; |
2747 | 862 |
var tmpsurf: PSDL_SURFACE; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
863 |
w, h, i, j: LongInt; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
864 |
font: THWFont; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
865 |
r, r2: TSDL_Rect; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
866 |
wa, ha: LongInt; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
867 |
tmpline, tmpline2, tmpdesc: ansistring; |
2747 | 868 |
begin |
2843 | 869 |
// make sure there is a caption as well as a sub caption - description is optional |
10123 | 870 |
if length(caption) = 0 then |
871 |
caption:= ansistring('???'); |
|
10229 | 872 |
if length(subcaption) = 0 then |
10123 | 873 |
subcaption:= ansistring(_S' '); |
2843 | 874 |
|
2841 | 875 |
font:= CheckCJKFont(caption,fnt16); |
876 |
font:= CheckCJKFont(subcaption,font); |
|
877 |
font:= CheckCJKFont(description,font); |
|
878 |
font:= CheckCJKFont(extra,font); |
|
2747 | 879 |
|
880 |
w:= 0; |
|
881 |
h:= 0; |
|
6982 | 882 |
wa:= cFontBorder * 2 + 4; |
883 |
ha:= cFontBorder * 2; |
|
2747 | 884 |
|
3407 | 885 |
i:= 0; j:= 0; // avoid compiler hints |
886 |
||
2747 | 887 |
// TODO: Recheck height/position calculation |
888 |
||
889 |
// get caption's dimensions |
|
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10120
diff
changeset
|
890 |
TTF_SizeUTF8(Fontz[font].Handle, PChar(caption), @i, @j); |
2747 | 891 |
// width adds 36 px (image + space) |
892 |
w:= i + 36 + wa; |
|
893 |
h:= j + ha; |
|
894 |
||
895 |
// get sub caption's dimensions |
|
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10120
diff
changeset
|
896 |
TTF_SizeUTF8(Fontz[font].Handle, PChar(subcaption), @i, @j); |
2747 | 897 |
// width adds 36 px (image + space) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
898 |
if w < (i + 36 + wa) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
899 |
w:= i + 36 + wa; |
2747 | 900 |
inc(h, j + ha); |
901 |
||
902 |
// get description's dimensions |
|
903 |
tmpdesc:= description; |
|
10120 | 904 |
while length(tmpdesc) > 0 do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
905 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
906 |
tmpline:= tmpdesc; |
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10130
diff
changeset
|
907 |
SplitByCharA(tmpline, tmpdesc, '|'); |
10120 | 908 |
if length(tmpline) > 0 then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
909 |
begin |
10120 | 910 |
TTF_SizeUTF8(Fontz[font].Handle, PChar(tmpline), @i, @j); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
911 |
if w < (i + wa) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
912 |
w:= i + wa; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
913 |
inc(h, j + ha) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
914 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
915 |
end; |
2747 | 916 |
|
10123 | 917 |
if length(extra) > 0 then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
918 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
919 |
// get extra label's dimensions |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10120
diff
changeset
|
920 |
TTF_SizeUTF8(Fontz[font].Handle, PChar(extra), @i, @j); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
921 |
if w < (i + wa) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
922 |
w:= i + wa; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
923 |
inc(h, j + ha); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
924 |
end; |
3697 | 925 |
|
2747 | 926 |
// add borders space |
927 |
inc(w, wa); |
|
928 |
inc(h, ha + 8); |
|
929 |
||
930 |
tmpsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, RMask, GMask, BMask, AMask); |
|
11537 | 931 |
if checkFails(tmpsurf <> nil, 'RenderHelpWindow: fail to create surface', true) then exit(nil); |
2747 | 932 |
|
933 |
// render border and background |
|
934 |
r.x:= 0; |
|
935 |
r.y:= 0; |
|
936 |
r.w:= w; |
|
937 |
r.h:= h; |
|
938 |
DrawRoundRect(@r, cWhiteColor, cNearBlackColor, tmpsurf, true); |
|
939 |
||
940 |
// render caption |
|
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10120
diff
changeset
|
941 |
r:= WriteInRect(tmpsurf, 36 + cFontBorder + 2, ha, $ffffffff, font, PChar(caption)); |
2747 | 942 |
// render sub caption |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10120
diff
changeset
|
943 |
r:= WriteInRect(tmpsurf, 36 + cFontBorder + 2, r.y + r.h, $ffc7c7c7, font, PChar(subcaption)); |
2747 | 944 |
|
945 |
// render all description lines |
|
946 |
tmpdesc:= description; |
|
10120 | 947 |
while length(tmpdesc) > 0 do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
948 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
949 |
tmpline:= tmpdesc; |
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10130
diff
changeset
|
950 |
SplitByCharA(tmpline, tmpdesc, '|'); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
951 |
r2:= r; |
10120 | 952 |
if length(tmpline) > 0 then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
953 |
begin |
10120 | 954 |
r:= WriteInRect(tmpsurf, cFontBorder + 2, r.y + r.h, $ff707070, font, PChar(tmpline)); |
3697 | 955 |
|
5518 | 956 |
// render highlighted caption (if there is a ':') |
7134 | 957 |
tmpline2:= _S''; |
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10130
diff
changeset
|
958 |
SplitByCharA(tmpline, tmpline2, ':'); |
10120 | 959 |
if length(tmpline2) > 0 then |
10128 | 960 |
begin |
961 |
tmpline:= tmpline + ':'; |
|
962 |
WriteInRect(tmpsurf, cFontBorder + 2, r2.y + r2.h, $ffc7c7c7, font, PChar(tmpline)); |
|
963 |
end; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
964 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
965 |
end; |
2747 | 966 |
|
10123 | 967 |
if length(extra) > 0 then |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10120
diff
changeset
|
968 |
r:= WriteInRect(tmpsurf, cFontBorder + 2, r.y + r.h, extracolor, font, PChar(extra)); |
2747 | 969 |
|
6982 | 970 |
r.x:= cFontBorder + 6; |
971 |
r.y:= cFontBorder + 4; |
|
2747 | 972 |
r.w:= 32; |
973 |
r.h:= 32; |
|
12467
4cc83b26b35c
Fix ammo tooltip icon being white
Wuzzy <almikes@aol.com>
parents:
12329
diff
changeset
|
974 |
SDL_FillRect(tmpsurf, @r, $ff000000); |
2747 | 975 |
SDL_UpperBlit(iconsurf, iconrect, tmpsurf, @r); |
3697 | 976 |
|
2747 | 977 |
RenderHelpWindow:= Surface2Tex(tmpsurf, true); |
978 |
SDL_FreeSurface(tmpsurf) |
|
979 |
end; |
|
980 |
||
981 |
procedure RenderWeaponTooltip(atype: TAmmoType); |
|
982 |
var r: TSDL_Rect; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
983 |
i: LongInt; |
11944
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
984 |
ammoname: ansistring; |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
985 |
ammocap: ansistring; |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
986 |
ammodesc: ansistring; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
987 |
extra: ansistring; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
988 |
extracolor: LongInt; |
2747 | 989 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
990 |
// don't do anything if the window shouldn't be shown |
3634 | 991 |
if (cReducedQuality and rqTooltipsOff) <> 0 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
992 |
begin |
3634 | 993 |
WeaponTooltipTex:= nil; |
994 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
995 |
end; |
2747 | 996 |
|
997 |
// free old texture |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10626
diff
changeset
|
998 |
FreeAndNilTexture(WeaponTooltipTex); |
2747 | 999 |
|
1000 |
// image region |
|
1001 |
i:= LongInt(atype) - 1; |
|
3853 | 1002 |
r.x:= (i shr 4) * 32; |
1003 |
r.y:= (i mod 16) * 32; |
|
2747 | 1004 |
r.w:= 32; |
1005 |
r.h:= 32; |
|
1006 |
||
1007 |
// default (no extra text) |
|
7134 | 1008 |
extra:= _S''; |
2747 | 1009 |
extracolor:= 0; |
1010 |
||
1011 |
if (CurrentTeam <> nil) and (Ammoz[atype].SkipTurns >= CurrentTeam^.Clan^.TurnNumber) then // weapon or utility is not yet available |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1012 |
begin |
12925
21827fc9ca98
Fix timebox being usable in SD w/ damage=0
Wuzzy <Wuzzy2@mail.ru>
parents:
12849
diff
changeset
|
1013 |
if (atype = amTardis) and (SuddenDeathActive) then |
12180
9237bfb198c7
Fix time box tooltip saying it is not *yet* available in SD
Wuzzy <almikes@aol.com>
parents:
12163
diff
changeset
|
1014 |
extra:= trmsg[sidNotAvailableInSD] |
9237bfb198c7
Fix time box tooltip saying it is not *yet* available in SD
Wuzzy <almikes@aol.com>
parents:
12163
diff
changeset
|
1015 |
else |
9237bfb198c7
Fix time box tooltip saying it is not *yet* available in SD
Wuzzy <almikes@aol.com>
parents:
12163
diff
changeset
|
1016 |
extra:= trmsg[sidNotYetAvailable]; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1017 |
extracolor:= LongInt($ffc77070); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1018 |
end |
5518 | 1019 |
else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then // weapon or utility will not end your turn |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1020 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1021 |
extra:= trmsg[sidNoEndTurn]; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1022 |
extracolor:= LongInt($ff70c770); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1023 |
end |
3697 | 1024 |
else |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1025 |
begin |
7134 | 1026 |
extra:= _S''; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1027 |
extracolor:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1028 |
end; |
2747 | 1029 |
|
11944
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1030 |
if length(trluaammo[Ammoz[atype].NameId]) > 0 then |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1031 |
ammoname := trluaammo[Ammoz[atype].NameId] |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1032 |
else |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1033 |
ammoname := trammo[Ammoz[atype].NameId]; |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1034 |
|
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1035 |
if length(trluaammoc[Ammoz[atype].NameId]) > 0 then |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1036 |
ammocap := trluaammoc[Ammoz[atype].NameId] |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1037 |
else |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1038 |
ammocap := trammoc[Ammoz[atype].NameId]; |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1039 |
|
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1040 |
if length(trluaammod[Ammoz[atype].NameId]) > 0 then |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1041 |
ammodesc := trluaammod[Ammoz[atype].NameId] |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1042 |
else |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1043 |
ammodesc := trammod[Ammoz[atype].NameId]; |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1044 |
|
11946
7ece39a537bd
Add SetAmmoDescriptionAppendix to Lua API, see issue 82
Wuzzy <almikes@aol.com>
parents:
11944
diff
changeset
|
1045 |
if length(trluaammoa[Ammoz[atype].NameId]) > 0 then |
7ece39a537bd
Add SetAmmoDescriptionAppendix to Lua API, see issue 82
Wuzzy <almikes@aol.com>
parents:
11944
diff
changeset
|
1046 |
ammodesc := ammodesc + '|' + trluaammoa[Ammoz[atype].NameId]; |
7ece39a537bd
Add SetAmmoDescriptionAppendix to Lua API, see issue 82
Wuzzy <almikes@aol.com>
parents:
11944
diff
changeset
|
1047 |
|
2747 | 1048 |
// render window and return the texture |
11944
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11900
diff
changeset
|
1049 |
WeaponTooltipTex:= RenderHelpWindow(ammoname, ammocap, ammodesc, extra, extracolor, SpritesData[sprAMAmmos].Surface, @r) |
2753 | 1050 |
end; |
2747 | 1051 |
|
1052 |
procedure ShowWeaponTooltip(x, y: LongInt); |
|
1053 |
begin |
|
1054 |
// draw the texture if it exists |
|
1055 |
if WeaponTooltipTex <> nil then |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2910
diff
changeset
|
1056 |
DrawTexture(x, y, WeaponTooltipTex) |
2747 | 1057 |
end; |
1058 |
||
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7198
diff
changeset
|
1059 |
{$IFDEF USE_VIDEO_RECORDING} |
7350
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1060 |
procedure InitOffscreenOpenGL; |
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1061 |
begin |
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1062 |
// create hidden window |
11358 | 1063 |
SDLwindow:= SDL_CreateWindow(PChar('hedgewars video rendering (SDL2 hidden window)'), |
7350
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1064 |
SDL_WINDOWPOS_CENTERED_MASK, SDL_WINDOWPOS_CENTERED_MASK, |
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1065 |
cScreenWidth, cScreenHeight, |
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1066 |
SDL_WINDOW_HIDDEN or SDL_WINDOW_OPENGL); |
11512 | 1067 |
if SDLCheck(SDLwindow <> nil, 'SDL_CreateWindow', true) then exit; |
7350
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1068 |
SetupOpenGL(); |
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1069 |
end; |
1dbf3f4340e0
When compiling with sdl2 use it instead of glut for creating hidden window (as suggested by koda).
Stepan777 <stepik-777@mail.ru>
parents:
7235
diff
changeset
|
1070 |
{$ENDIF} // USE_VIDEO_RECORDING |
7180 | 1071 |
|
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1072 |
procedure chFullScr(var s: shortstring); |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1073 |
var flags: Longword = 0; |
6072 | 1074 |
reinit: boolean = false; |
1075 |
{$IFNDEF DARWIN}ico: PSDL_Surface;{$ENDIF} |
|
11338 | 1076 |
x, y: LongInt; |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1077 |
begin |
8027
e5ba3dd12531
make stats-only mode work headless. also skip a few things to save time/memory.
nemo
parents:
7866
diff
changeset
|
1078 |
if cOnlyStats then |
e5ba3dd12531
make stats-only mode work headless. also skip a few things to save time/memory.
nemo
parents:
7866
diff
changeset
|
1079 |
begin |
e5ba3dd12531
make stats-only mode work headless. also skip a few things to save time/memory.
nemo
parents:
7866
diff
changeset
|
1080 |
MaxTextureSize:= 1024; |
e5ba3dd12531
make stats-only mode work headless. also skip a few things to save time/memory.
nemo
parents:
7866
diff
changeset
|
1081 |
exit |
e5ba3dd12531
make stats-only mode work headless. also skip a few things to save time/memory.
nemo
parents:
7866
diff
changeset
|
1082 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
1083 |
if Length(s) = 0 then |
8027
e5ba3dd12531
make stats-only mode work headless. also skip a few things to save time/memory.
nemo
parents:
7866
diff
changeset
|
1084 |
cFullScreen:= (not cFullScreen) |
e5ba3dd12531
make stats-only mode work headless. also skip a few things to save time/memory.
nemo
parents:
7866
diff
changeset
|
1085 |
else cFullScreen:= s = '1'; |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1086 |
|
8354
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1087 |
if cFullScreen then |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1088 |
begin |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1089 |
cScreenWidth:= cFullscreenWidth; |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1090 |
cScreenHeight:= cFullscreenHeight; |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1091 |
end |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1092 |
else |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1093 |
begin |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1094 |
cScreenWidth:= cWindowedWidth; |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1095 |
cScreenHeight:= cWindowedHeight; |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8309
diff
changeset
|
1096 |
end; |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1097 |
|
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1098 |
AddFileLog('Preparing to change video parameters...'); |
6598
fa518383563b
added pause/resume functionality for android, android need the opengl context to be recreated along with textures and whatnot
Xeli
parents:
6580
diff
changeset
|
1099 |
if SDLwindow = nil then |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1100 |
begin |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1101 |
// set window title |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1102 |
WriteToConsole('Init SDL_image... '); |
11512 | 1103 |
if SDLCheck(IMG_Init(IMG_INIT_PNG) <> 0, 'IMG_Init', true) then exit; |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1104 |
WriteLnToConsole(msgOK); |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1105 |
end |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1106 |
else |
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1107 |
begin |
6675
dab56311daa5
tipped by xeli, ammomenu texture needs to be redrawn on resize to update its position
koda
parents:
6674
diff
changeset
|
1108 |
AmmoMenuInvalidated:= true; |
6611 | 1109 |
{$IFDEF IPHONEOS} |
1110 |
// chFullScr is called when there is a rotation event and needs the SetScale and SetupOpenGL to set up the new resolution |
|
1111 |
// this 6 gl functions are the relevant ones and are hacked together here for optimisation |
|
1112 |
glMatrixMode(GL_MODELVIEW); |
|
1113 |
glPopMatrix; |
|
1114 |
glLoadIdentity(); |
|
1115 |
glScalef(2.0 / cScreenWidth, -2.0 / cScreenHeight, 1.0); |
|
1116 |
glTranslatef(0, -cScreenHeight / 2, 0); |
|
1117 |
glViewport(0, 0, cScreenWidth, cScreenHeight); |
|
1118 |
exit; |
|
1119 |
{$ELSE} |
|
5847 | 1120 |
SetScale(cDefaultZoomLevel); |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1121 |
{$IFDEF USE_CONTEXT_RESTORE} |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
1122 |
reinit:= true; |
6394
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
1123 |
StoreRelease(true); |
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
1124 |
ResetLand; |
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
1125 |
ResetWorldTex; |
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
1126 |
//uTextures.freeModule; //DEBUG ONLY |
6598
fa518383563b
added pause/resume functionality for android, android need the opengl context to be recreated along with textures and whatnot
Xeli
parents:
6580
diff
changeset
|
1127 |
{$ENDIF} |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1128 |
AddFileLog('Freeing old primary surface...'); |
6611 | 1129 |
{$ENDIF} |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1130 |
end; |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1131 |
|
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1132 |
// these attributes must be set up before creating the sdl window |
5883
a6d764786905
Disable GL SetAttributes for Windows due to many testers with problems. This restores .15 behaviour.
nemo
parents:
5847
diff
changeset
|
1133 |
{$IFNDEF WIN32} |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1134 |
(* On a large number of testers machines, SDL default to software rendering |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1135 |
when opengl attributes were set. These attributes were "set" after |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1136 |
CreateWindow in .15, which probably did nothing. |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1137 |
IMO we should rely on the gl_config defaults from SDL, and use |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1138 |
SDL_GL_GetAttribute to possibly post warnings if any bad values are set. |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1139 |
*) |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1140 |
SetupOpenGLAttributes(); |
5883
a6d764786905
Disable GL SetAttributes for Windows due to many testers with problems. This restores .15 behaviour.
nemo
parents:
5847
diff
changeset
|
1141 |
{$ENDIF} |
11523
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1142 |
|
5187 | 1143 |
// these values in x and y make the window appear in the center |
1144 |
x:= SDL_WINDOWPOS_CENTERED_MASK; |
|
1145 |
y:= SDL_WINDOWPOS_CENTERED_MASK; |
|
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1146 |
|
6021 | 1147 |
if SDLwindow = nil then |
11523
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1148 |
begin |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1149 |
|
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1150 |
// SDL_WINDOW_RESIZABLE makes the window resizable and |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1151 |
// respond to rotation events on mobile devices |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1152 |
flags:= SDL_WINDOW_OPENGL or SDL_WINDOW_SHOWN or SDL_WINDOW_RESIZABLE; |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1153 |
|
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1154 |
{$IFDEF MOBILE} |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1155 |
if isPhone() then |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1156 |
SDL_SetHint('SDL_IOS_ORIENTATIONS','LandscapeLeft LandscapeRight'); |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1157 |
// no need for borders on mobile devices |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1158 |
flags:= flags or SDL_WINDOW_BORDERLESS; |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1159 |
{$ENDIF} |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1160 |
|
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1161 |
if cFullScreen then |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1162 |
flags:= flags or SDL_WINDOW_FULLSCREEN; |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1163 |
|
11358 | 1164 |
SDLwindow:= SDL_CreateWindow(PChar('Hedgewars'), x, y, cScreenWidth, cScreenHeight, flags); |
11523
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1165 |
end |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1166 |
// we're toggling |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1167 |
else if Length(s) = 0 then |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1168 |
begin |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1169 |
if cFullScreen then |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1170 |
begin |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1171 |
SDL_SetWindowSize(SDLwindow, cScreenWidth, cScreenHeight); |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1172 |
SDL_SetWindowFullscreen(SDLwindow, SDL_WINDOW_FULLSCREEN); |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1173 |
end |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1174 |
else |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1175 |
begin |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1176 |
SDL_SetWindowFullscreen(SDLwindow, 0); |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1177 |
SDL_SetWindowSize(SDLwindow, cScreenWidth, cScreenHeight); |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1178 |
SDL_SetWindowPosition(SDLwindow, x, y); |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1179 |
end; |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1180 |
updateViewLimits(); |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1181 |
end; |
02a13be714d2
SDL2: fix toggling fullscreen. dunno how well this works on non-linux-OS
sheepluva
parents:
11512
diff
changeset
|
1182 |
|
11512 | 1183 |
if SDLCheck(SDLwindow <> nil, 'SDL_CreateWindow', true) then exit; |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1184 |
|
11378 | 1185 |
// load engine ico |
1186 |
{$IFNDEF DARWIN} |
|
1187 |
ico:= LoadDataImage(ptGraphics, 'hwengine', ifIgnoreCaps); |
|
1188 |
if ico <> nil then |
|
1189 |
begin |
|
1190 |
SDL_SetWindowIcon(SDLwindow, ico); |
|
1191 |
SDL_FreeSurface(ico); |
|
1192 |
end; |
|
1193 |
{$ENDIF} |
|
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1194 |
SetupOpenGL(); |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7866
diff
changeset
|
1195 |
|
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
1196 |
if reinit then |
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
1197 |
begin |
6394
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
1198 |
// clean the window from any previous content |
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10302
diff
changeset
|
1199 |
RenderClear(); |
5704 | 1200 |
if SuddenDeathDmg then |
11900
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11827
diff
changeset
|
1201 |
SetSkyColor(SDSkyColor.r * (SDTint.r/255) / 255, SDSkyColor.g * (SDTint.g/255) / 255, SDSkyColor.b * (SDTint.b/255) / 255) |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1202 |
else if ((cReducedQuality and rqNoBackground) = 0) then |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1203 |
SetSkyColor(SkyColor.r / 255, SkyColor.g / 255, SkyColor.b / 255) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6515
diff
changeset
|
1204 |
else |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1205 |
SetSkyColor(RQSkyColor.r / 255, RQSkyColor.g / 255, RQSkyColor.b / 255); |
5704 | 1206 |
|
6394
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
1207 |
// reload everything we had before |
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
1208 |
ReloadCaptions(false); |
6382
0e76c5cd4250
move the order of reloading texture to workaround buggy drivers
koda
parents:
6380
diff
changeset
|
1209 |
ReloadLines; |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
1210 |
StoreLoad(true); |
6394
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6382
diff
changeset
|
1211 |
// redraw all land |
7170
84ac6c6d2d8e
Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents:
7151
diff
changeset
|
1212 |
UpdateLandTexture(0, LAND_WIDTH, 0, LAND_HEIGHT, false); |
5608
1e5d925dde9d
Attempt to recreate all textures if using Windows or OSX which lose textures on context recreation.
nemo
parents:
5565
diff
changeset
|
1213 |
end; |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1214 |
end; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1215 |
|
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1216 |
// for sdl1.2 we directly call SDL_WarpMouse() |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1217 |
// for sdl2 we provide a SDL_WarpMouse() which just calls this function |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1218 |
// this has the advantage of reducing 'uses' and 'ifdef' statements |
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1219 |
// (SDLwindow is a private member of this module) |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1220 |
procedure WarpMouse(x, y: Word); inline; |
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1221 |
begin |
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1222 |
SDL_WarpMouseInWindow(SDLwindow, x, y); |
9317
a04c30940d2d
use SDL2 as ifdef symbol because we're not really sdl1.3 compatible, change the compatibility layer, drop unused code, add some documentation
koda
parents:
9295
diff
changeset
|
1223 |
end; |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1224 |
|
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1225 |
procedure SwapBuffers; {$IFDEF USE_VIDEO_RECORDING}cdecl{$ELSE}inline{$ENDIF}; |
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1226 |
begin |
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1227 |
if GameType = gmtRecord then |
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1228 |
exit; |
9684 | 1229 |
SDL_GL_SwapWindow(SDLwindow); |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1230 |
end; |
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1231 |
|
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1232 |
procedure SetSkyColor(r, g, b: real); |
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1233 |
begin |
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10302
diff
changeset
|
1234 |
RenderSetClearColor(r, g, b, 0.99) |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1235 |
end; |
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1236 |
|
3038 | 1237 |
procedure initModule; |
4925 | 1238 |
var ai: TAmmoType; |
1239 |
i: LongInt; |
|
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2698
diff
changeset
|
1240 |
begin |
6898 | 1241 |
RegisterVariable('fullscr', @chFullScr, true); |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4390
diff
changeset
|
1242 |
|
7121
ce5e70fe4eb3
http://www.demoties.com/wp-content/uploads/2011/03/mar-01-6.jpg
nemo
parents:
7102
diff
changeset
|
1243 |
cScaleFactor:= 2.0; |
10266 | 1244 |
updateViewLimits(); |
3394
47b51e22e670
Henek's patch - adds a column to ammoMenu and removes the F* column in iphone version
koda
parents:
3390
diff
changeset
|
1245 |
Step:= 0; |
47b51e22e670
Henek's patch - adds a column to ammoMenu and removes the F* column in iphone version
koda
parents:
3390
diff
changeset
|
1246 |
ProgrTex:= nil; |
5660
1647244b3ffe
set gl attributes before creating the window, or some of them might be ignored (like vsync on osx); also don't skip some reloads when switching to fullscreen and back; finally did a little code re-organisation
koda
parents:
5654
diff
changeset
|
1247 |
SupportNPOTT:= false; |
4925 | 1248 |
|
1249 |
// init all ammo name texture pointers |
|
1250 |
for ai:= Low(TAmmoType) to High(TAmmoType) do |
|
1251 |
begin |
|
1252 |
Ammoz[ai].NameTex := nil; |
|
1253 |
end; |
|
1254 |
// init all count texture pointers |
|
1255 |
for i:= Low(CountTexz) to High(CountTexz) do |
|
1256 |
CountTexz[i] := nil; |
|
7049 | 1257 |
SDLwindow:= nil; |
1258 |
SDLGLcontext:= nil; |
|
10262 | 1259 |
|
1260 |
prevHat:= 'NoHat'; |
|
1261 |
tmpHatSurf:= nil; |
|
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2698
diff
changeset
|
1262 |
end; |
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2698
diff
changeset
|
1263 |
|
3038 | 1264 |
procedure freeModule; |
10640 | 1265 |
var fi: THWFont; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2705
diff
changeset
|
1266 |
begin |
7026
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
7013
diff
changeset
|
1267 |
StoreRelease(false); |
10640 | 1268 |
// make sure fonts are cleaned up |
1269 |
for fi:= Low(THWFont) to High(THWFont) do |
|
1270 |
with Fontz[fi] do |
|
1271 |
begin |
|
1272 |
if Handle <> nil then |
|
1273 |
begin |
|
1274 |
TTF_CloseFont(Handle); |
|
1275 |
Handle:= nil; |
|
1276 |
end; |
|
1277 |
end; |
|
1278 |
||
7026
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
7013
diff
changeset
|
1279 |
TTF_Quit(); |
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
7013
diff
changeset
|
1280 |
SDL_GL_DeleteContext(SDLGLcontext); |
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
7013
diff
changeset
|
1281 |
SDL_DestroyWindow(SDLwindow); |
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
7013
diff
changeset
|
1282 |
SDL_Quit(); |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2705
diff
changeset
|
1283 |
end; |
4 | 1284 |
end. |