-
Notifications
You must be signed in to change notification settings - Fork 6
/
wolf3d.patch
1880 lines (1655 loc) · 49 KB
/
wolf3d.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/id_ca.c b/id_ca.c
index e81502b..7d3dc44 100644
--- a/id_ca.c
+++ b/id_ca.c
@@ -41,11 +41,11 @@ typedef struct
typedef struct
{
word RLEWtag;
-#if MAPPLANES >= 4
+//#if MAPPLANES >= 4
word numplanes; // unused, but WDC needs 2 bytes here for internal usage
-#endif
+//#endif
int32_t headeroffsets[NUMMAPS];
-} mapfiletype;
+} PACKED mapfiletype;
/*
@@ -155,7 +155,11 @@ void CA_WriteFile (const char *filename, void *ptr, int32_t length)
CA_CannotOpen (filename);
if (!fwrite(ptr,length,1,file))
+#ifdef EMBEDDED
+ Quit ("Error writing file: %s",filename);
+#else
Quit ("Error writing file %s: %s",filename,strerror(errno));
+#endif
fclose (file);
}
@@ -188,7 +192,11 @@ void CA_LoadFile (const char *filename, void **ptr)
*ptr = SafeMalloc(size);
if (!fread(*ptr,size,1,file))
+#ifdef EMBEDDED
+ Quit ("Error reading file: %s",filename);
+#else
Quit ("Error reading file %s: %s",filename,strerror(errno));
+#endif
fclose (file);
}
@@ -547,7 +555,12 @@ void CAL_SetupMapFile (void)
tinf = SafeMalloc(sizeof(*tinf));
+#if MAPPLANES >= 4
fread (tinf,sizeof(*tinf),1,file);
+#else
+ fread (&tinf->RLEWtag,sizeof(tinf->RLEWtag),1,file);
+ fread (&tinf->headeroffsets,sizeof(tinf->headeroffsets),1,file);
+#endif
fclose (file);
//
@@ -684,6 +697,7 @@ void CA_Shutdown (void)
switch(oldsoundmode)
{
+ default:
case sdm_Off:
return;
case sdm_PC:
@@ -788,6 +802,7 @@ void CA_CacheAdlibSoundChunk (int chunk)
void CA_LoadAllSounds (void)
{
+#if !NO_SOUND
unsigned start,i;
if (oldsoundmode != sdm_Off)
@@ -831,6 +846,7 @@ void CA_LoadAllSounds (void)
for (i=0;i<NUMSOUNDS;i++,start++)
CA_CacheAudioChunk(start);
}
+#endif
}
//===========================================================================
@@ -958,7 +974,7 @@ void CA_CacheGrChunks (FILE *grfile)
fseek (grfile,pos,SEEK_SET);
- bufferseg = SafeMalloc(compressed);
+ bufferseg = SafeMalloc(compressed + 1); // extra byte for buggy mods
source = bufferseg;
fread (source,compressed,1,grfile);
diff --git a/id_ca.h b/id_ca.h
index 2e25fb4..9e7768a 100644
--- a/id_ca.h
+++ b/id_ca.h
@@ -16,7 +16,7 @@ typedef struct
word planelength[MAPPLANES];
word width,height;
char name[16];
-} maptype;
+} PACKED maptype;
//===========================================================================
diff --git a/id_in.c b/id_in.c
index 522f1ee..ca81b2d 100644
--- a/id_in.c
+++ b/id_in.c
@@ -61,6 +61,9 @@ static byte DirTable[] = // Quick lookup for total direction
///////////////////////////////////////////////////////////////////////////
static int INL_GetMouseButtons (void)
{
+#if NO_MOUSE
+ int buttons = 0;
+#else
int buttons = SDL_GetMouseState(NULL,NULL);
int middlePressed = buttons & SDL_BUTTON(SDL_BUTTON_MIDDLE);
int rightPressed = buttons & SDL_BUTTON(SDL_BUTTON_RIGHT);
@@ -71,6 +74,7 @@ static int INL_GetMouseButtons (void)
buttons |= 1 << 2;
if (rightPressed)
buttons |= 1 << 1;
+#endif
return buttons;
}
@@ -81,6 +85,12 @@ static int INL_GetMouseButtons (void)
// joystick (from +/-127)
//
///////////////////////////////////////////////////////////////////////////
+#if NO_JOYSTICK
+void IN_GetJoyDelta(int *dx, int *dy) { *dx = 0; *dx = 0; }
+void IN_GetJoyFineDelta(int *dx, int *dy) { *dx = 0; *dx = 0; }
+int IN_JoyButtons(void) { return 0; }
+boolean IN_JoyPresent(void) { return 0; }
+#else
void IN_GetJoyDelta (int *dx, int *dy)
{
if (!Joystick)
@@ -178,6 +188,7 @@ boolean IN_JoyPresent (void)
{
return Joystick != NULL;
}
+#endif
/*
@@ -190,8 +201,10 @@ boolean IN_JoyPresent (void)
void IN_CenterMouse (void)
{
+#if !NO_MOUSE
if (MousePresent && GrabInput)
SDL_WarpMouseInWindow (window,screenWidth / 2,screenHeight / 2);
+#endif
}
@@ -203,6 +216,7 @@ void IN_CenterMouse (void)
===================
*/
+#ifndef EMBEDDED
ScanCode IN_MapKey (int key)
{
ScanCode scan = key;
@@ -233,6 +247,7 @@ ScanCode IN_MapKey (int key)
return scan;
}
+#endif
/*
@@ -243,6 +258,7 @@ ScanCode IN_MapKey (int key)
===================
*/
+#if !NO_MOUSE
void IN_SetWindowGrab (SDL_Window *window)
{
const char *which[] = {"hide","show"};
@@ -255,6 +271,7 @@ void IN_SetWindowGrab (SDL_Window *window)
if (SDL_SetRelativeMouseMode(GrabInput))
Quit ("Unable to set relative mode for mouse: %s\n",SDL_GetError());
}
+#endif
/*
@@ -280,6 +297,35 @@ void IN_SetWindowGrab (SDL_Window *window)
===========================================
*/
+#ifdef EMBEDDED
+int RunInvert;
+static void IN_HandleEvents(int wait) {
+ for (;;) {
+ int key, type = sys_event(&key);
+ if (type == EVENT_END) {
+ if (!wait) break;
+ SDL_Delay(10);
+ continue;
+ }
+ wait = 0;
+ switch (type) {
+ case EVENT_QUIT:
+ Quit(NULL);
+ break;
+ case EVENT_KEYDOWN:
+ LastScan = key;
+ if (key == sc_CapsLock) RunInvert ^= 1;
+ if (key < sc_Last) Keyboard[key] = 1;
+ break;
+ case EVENT_KEYUP:
+ if (key < sc_Last) Keyboard[key] = 0;
+ break;
+ }
+ }
+}
+void IN_ProcessEvents(void) { IN_HandleEvents(0); }
+void IN_WaitAndProcessEvents(void) { IN_HandleEvents(1); }
+#else
static void IN_HandleEvent (SDL_Event *event)
{
int key;
@@ -293,6 +339,7 @@ static void IN_HandleEvent (SDL_Event *event)
break;
case SDL_KEYDOWN:
+#if !NO_MOUSE
if (key == sc_ScrollLock || key == sc_F12)
{
GrabInput = !GrabInput;
@@ -301,6 +348,7 @@ static void IN_HandleEvent (SDL_Event *event)
return;
}
+#endif
LastScan = IN_MapKey(key);
@@ -360,6 +408,7 @@ void IN_WaitAndProcessEvents (void)
IN_WaitEvent ();
IN_ProcessEvents ();
}
+#endif
///////////////////////////////////////////////////////////////////////////
@@ -374,6 +423,7 @@ void IN_Startup(void)
IN_ClearKeysDown();
+#if !NO_JOYSTICK
if (param_joystickindex >= 0 && param_joystickindex < SDL_NumJoysticks())
{
Joystick = SDL_JoystickOpen(param_joystickindex);
@@ -391,7 +441,9 @@ void IN_Startup(void)
Quit ("The joystickhat param must be between 0 and %i!",JoyNumHats - 1);
}
}
+#endif
+#if !NO_MOUSE
SDL_EventState (SDL_MOUSEMOTION,SDL_IGNORE);
if (fullscreen || forcegrabmouse)
@@ -400,12 +452,15 @@ void IN_Startup(void)
IN_SetWindowGrab (window);
}
+#endif
// I didn't find a way to ask libSDL whether a mouse is present, yet...
#if defined(GP2X)
MousePresent = false;
#elif defined(_arch_dreamcast)
MousePresent = DC_MousePresent();
+#elif NO_MOUSE
+ MousePresent = false;
#else
MousePresent = true;
#endif
@@ -423,8 +478,10 @@ void IN_Shutdown(void)
if (!IN_Started)
return;
+#if !NO_JOYSTICK
if (Joystick)
SDL_JoystickClose(Joystick);
+#endif
IN_Started = false;
}
@@ -444,7 +501,11 @@ void IN_ClearKeysDown(void)
void IN_ClearTextInput (void)
{
+#ifdef EMBEDDED
+ textinput[0] = 0;
+#else
memset (textinput,0,sizeof(textinput));
+#endif
}
@@ -466,6 +527,7 @@ void IN_ReadControl (ControlInfo *info)
IN_ProcessEvents();
+#ifndef EMBEDDED
if (Keyboard[sc_Home])
{
mx = -1;
@@ -486,6 +548,7 @@ void IN_ReadControl (ControlInfo *info)
mx = 1;
my = 1;
}
+#endif
if (Keyboard[sc_UpArrow])
my = -1;
diff --git a/id_in.h b/id_in.h
index 6c557f5..ca60169 100644
--- a/id_in.h
+++ b/id_in.h
@@ -8,6 +8,9 @@
#ifndef __ID_IN_H_
#define __ID_IN_H_
+#ifdef EMBEDDED
+#define TEXTINPUTSIZE 20
+#else
#define TEXTINPUTSIZE SDL_TEXTINPUTEVENT_TEXT_SIZE
#define sc_None SDL_SCANCODE_UNKNOWN
@@ -98,6 +101,7 @@
#define sc_X SDL_SCANCODE_X
#define sc_Y SDL_SCANCODE_Y
#define sc_Z SDL_SCANCODE_Z
+#endif
#define sc_Alt sc_LAlt
#define sc_Control sc_LControl
diff --git a/id_sd.c b/id_sd.c
index 1bd9163..75a56c9 100644
--- a/id_sd.c
+++ b/id_sd.c
@@ -28,6 +28,34 @@
//
#include "wl_def.h"
+#if NO_SOUND
+boolean AdLibPresent = false, SoundBlasterPresent = false;
+byte SoundMode = smm_Off, MusicMode = smm_Off, DigiMode = sds_Off;
+int DigiMap[LASTSOUND];
+int DigiChannel[STARTMUSIC - STARTDIGISOUNDS];
+
+void Delay(int32_t wolfticks) {
+ if (wolfticks > 0)
+ SDL_Delay((wolfticks * 100) / 7);
+}
+
+void SD_StopDigitized(void) {}
+void SD_PrepareSound(int which) {}
+int SD_PlayDigitized(word which,int leftpos,int rightpos) { return 0; }
+void SD_SetDigiDevice(byte mode) {}
+boolean SD_SetSoundMode(byte mode) { return mode == smm_Off; }
+boolean SD_SetMusicMode(byte mode) { return mode == smm_Off; }
+void SD_Startup(void) {}
+void SD_Shutdown(void) {}
+boolean SD_PlaySound(int sound) { return 0; }
+word SD_SoundPlaying(void) { return 0; }
+void SD_StopSound(void) {}
+void SD_WaitSoundDone(void) {}
+void SD_MusicOn(void) {}
+int SD_MusicOff(void) { return 0; }
+void SD_StartMusic(int chunk) {}
+void SD_ContinueMusic(int chunk, int startoffs) {}
+#else
#include <SDL_mixer.h>
#if defined(GP2X_940)
#include "gp2x/fmopl.h"
@@ -1294,3 +1322,4 @@ SD_MusicPlaying(void)
return(result);
}
+#endif
diff --git a/id_us.c b/id_us.c
index 88a5590..7baab83 100644
--- a/id_us.c
+++ b/id_us.c
@@ -39,6 +39,10 @@ static boolean US_Started;
void (*USL_MeasureString)(const char *,word *,word *) = VW_MeasurePropString;
void (*USL_DrawString)(const char *) = VWB_DrawPropString;
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
SaveGame Games[MaxSaveGames];
HighScore Scores[MaxScores] =
{
@@ -50,6 +54,9 @@ static boolean US_Started;
{"John Romero",10000,1},
{"Jay Wilbur",10000,1},
};
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
int rndindex = 0;
@@ -595,6 +602,7 @@ US_LineInput(int x,int y,char *buf,const char *def,boolean escok,
}
}
+#if !NO_MOUSE
if((int)(curtime - lastbuttontime) > TickBase / 4) // 250 ms
{
if(ci.button0) // acts as return
@@ -623,11 +631,13 @@ US_LineInput(int x,int y,char *buf,const char *def,boolean escok,
checkkey = false;
}
}
+#endif
if(checkkey)
{
switch (sc)
{
+#ifndef EMBEDDED
case sc_LeftArrow:
if (cursor)
cursor--;
@@ -657,6 +667,7 @@ US_LineInput(int x,int y,char *buf,const char *def,boolean escok,
cursor = (int) strlen(s);
cursormoved = true;
break;
+#endif
case sc_Return:
snprintf (buf,maxchars + 1,"%s",s);
@@ -671,6 +682,7 @@ US_LineInput(int x,int y,char *buf,const char *def,boolean escok,
}
break;
+#ifndef EMBEDDED
case sc_BackSpace:
if (cursor)
{
@@ -690,6 +702,7 @@ US_LineInput(int x,int y,char *buf,const char *def,boolean escok,
}
cursormoved = true;
break;
+#endif
}
for (text = textinput; *text; text++)
diff --git a/id_vh.c b/id_vh.c
index 2f85e15..e942caf 100644
--- a/id_vh.c
+++ b/id_vh.c
@@ -73,11 +73,15 @@ void VW_MeasurePropString (const char *string, word *width, word *height)
void VH_UpdateScreen (SDL_Surface *surface)
{
+#ifdef EMBEDDED
+ wlsys_refresh(surface, 0);
+#else
SDL_BlitSurface (surface,NULL,screen,NULL);
SDL_UpdateTexture(texture, NULL, screen->pixels, screenPitch);
SDL_RenderCopy(renderer, texture, NULL, NULL);
SDL_RenderPresent(renderer);
+#endif
}
void VWB_DrawTile8 (int x, int y, int tile)
@@ -215,6 +219,14 @@ boolean FizzleFade (SDL_Surface *source, int x1, int y1,
{
unsigned x, y, p, frame, pixperframe;
int32_t rndval;
+#ifdef EMBEDDED
+ unsigned stride = screenWidth;
+ if (screenHeight == 256) {
+ width = (width + (x1 & 1) + 1) >> 1;
+ height = (height + (y1 & 1) + 1) >> 1;
+ x1 >>= 1; y1 >>= 1; stride >>= 1;
+ }
+#endif
rndval = 1;
pixperframe = width * height / frames;
@@ -236,10 +248,13 @@ boolean FizzleFade (SDL_Surface *source, int x1, int y1,
return true;
}
+#ifdef EMBEDDED
+ sys_wait_refresh();
+#else
byte *destptr = VL_LockSurface(screen);
-
if (!destptr)
Quit ("Unable to lock dest surface: %s\n",SDL_GetError());
+#endif
for (p = 0; p < pixperframe; p++)
{
@@ -261,6 +276,22 @@ boolean FizzleFade (SDL_Surface *source, int x1, int y1,
//
// copy one pixel
//
+#ifdef EMBEDDED
+ uint16_t *d = framebuf;
+ unsigned pos = (y1 + y) * screenWidth + (x1 + x);
+ if (stride == 160) {
+ unsigned a, b = 0x00400802;
+ uint32_t *pal = (uint32_t*)d - 0x100;
+ uint8_t *s = srcptr + pos * 2;
+ a = pal[s[0]] + pal[s[1]]; s += screenWidth;
+ a += pal[s[0]] + pal[s[1]];
+ a += (b & a >> 2) + b; a &= 0xf81f07e0;
+ d[(pos + x1 + x) >> 1] = a | a >> 16;
+ } else {
+ uint16_t *pal = d - 0x100;
+ d[pos] = pal[srcptr[pos]];
+ }
+#else
if(screenBits == 8)
{
*(destptr + (y1 + y) * screen->pitch + x1 + x)
@@ -273,6 +304,7 @@ boolean FizzleFade (SDL_Surface *source, int x1, int y1,
memcpy(destptr + (y1 + y) * screen->pitch + (x1 + x) * screen->format->BytesPerPixel,
&fullcol, screen->format->BytesPerPixel);
}
+#endif
}
if (rndval == 1)
@@ -282,7 +314,7 @@ boolean FizzleFade (SDL_Surface *source, int x1, int y1,
//
VL_UnlockSurface (screenBuffer);
VL_UnlockSurface (screen);
- VH_UpdateScreen (screenBuffer);
+ VW_UpdateScreenEx (1 | 16);
return false;
}
@@ -290,9 +322,13 @@ boolean FizzleFade (SDL_Surface *source, int x1, int y1,
VL_UnlockSurface(screen);
+#ifdef EMBEDDED
+ sys_start_refresh();
+#else
SDL_UpdateTexture(texture, NULL, screen->pixels, screenPitch);
SDL_RenderCopy(renderer, texture, NULL, NULL);
SDL_RenderPresent(renderer);
+#endif
frame++;
Delay(frame - GetTimeCount()); // don't go too fast
diff --git a/id_vh.h b/id_vh.h
index 851e80e..1e328da 100644
--- a/id_vh.h
+++ b/id_vh.h
@@ -67,7 +67,22 @@ void VWB_Vlin (int y1, int y2, int x, int color);
#define VWB_VlinScaledCoord VW_Vlin
void VH_UpdateScreen (SDL_Surface *surface);
+#if TRACE_UPDATE
+void print_trace(const char *file, int line);
+#define VW_UpdateScreen1() do { \
+ print_trace(__FILE__, __LINE__); \
+ VH_UpdateScreen (screenBuffer); \
+} while (0)
+#define VW_UpdateScreen VW_UpdateScreen1
+#else
#define VW_UpdateScreen() VH_UpdateScreen (screenBuffer)
+#endif
+#ifdef EMBEDDED
+#define VW_UpdateScreenEx(type) wlsys_refresh(screenBuffer, type)
+#else
+#define VW_UpdateScreenEx(type) VW_UpdateScreen()
+#endif
+
//
// wolfenstein EGA compatability stuff
diff --git a/id_vl.c b/id_vl.c
index e19cb31..ba1d485 100644
--- a/id_vl.c
+++ b/id_vl.c
@@ -39,11 +39,15 @@ unsigned screenPitch;
SDL_Surface *screenBuffer = NULL;
unsigned bufferPitch;
+#ifndef EMBEDDED
SDL_Window *window = NULL;
SDL_Renderer *renderer = NULL;
SDL_Texture *texture = NULL;
+#endif
+#if EMBEDDED != 2
int scaleFactor;
+#endif
boolean screenfaded;
unsigned bordercolor;
@@ -55,7 +59,11 @@ SDL_Color curpal[256];
#define CASSERT(x) extern int ASSERT_COMPILE[((x) != 0) * 2 - 1];
+#ifdef EMBEDDED
+#define RGB(r, g, b) {(r)*65>>4, (g)*65>>4, (b)*65>>4, SDL_ALPHA_OPAQUE}
+#else
#define RGB(r, g, b) {(r)*255/63, (g)*255/63, (b)*255/63, SDL_ALPHA_OPAQUE}
+#endif
SDL_Color gamepal[]={
#ifdef SPEAR
@@ -80,11 +88,13 @@ CASSERT(lengthof(gamepal) == 256)
void VL_Shutdown (void)
{
- SDL_FreeSurface (screenBuffer);
-
+#ifdef EMBEDDED
+ wlsys_end();
+#else
SDL_DestroyRenderer(renderer);
SDL_DestroyWindow(window);
SDL_DestroyTexture(texture);
+#endif
free (ylookup);
free (pixelangle);
@@ -112,6 +122,12 @@ void VL_Shutdown (void)
void VL_SetVGAPlaneMode (void)
{
int i;
+#ifdef EMBEDDED
+ screenBuffer = wlsys_init();
+ memcpy(curpal, gamepal, sizeof(SDL_Color) * 256);
+ wlsys_setpal(gamepal);
+ bufferPitch = screenWidth;
+#else
uint32_t a,r,g,b;
#ifdef SPEAR
@@ -157,9 +173,12 @@ void VL_SetVGAPlaneMode (void)
screenPitch = screen->pitch;
bufferPitch = screenBuffer->pitch;
+#endif
+#if EMBEDDED != 2
scaleFactor = screenWidth/320;
if(screenHeight/200 < scaleFactor) scaleFactor = screenHeight/200;
+#endif
ylookup = SafeMalloc(screenHeight * sizeof(*ylookup));
pixelangle = SafeMalloc(screenWidth * sizeof(*pixelangle));
@@ -259,6 +278,10 @@ void VL_SetPalette (SDL_Color *palette, bool forceupdate)
{
memcpy(curpal, palette, sizeof(SDL_Color) * 256);
+#ifdef EMBEDDED
+ wlsys_setpal(palette);
+ if (forceupdate) wlsys_refresh(screenBuffer, last_refresh_type);
+#else
if(screenBits == 8)
SDL_SetPaletteColors(screen->format->palette, palette, 0, 256);
else
@@ -267,6 +290,7 @@ void VL_SetPalette (SDL_Color *palette, bool forceupdate)
if (forceupdate)
VH_UpdateScreen (screenBuffer);
}
+#endif
}
@@ -398,6 +422,13 @@ void VL_FadeIn (int start, int end, SDL_Color *palette, int steps)
=============================================================================
*/
+#ifdef EMBEDDED
+byte *VL_LockSurface(SDL_Surface *surface) { return surface; }
+void VL_UnlockSurface(SDL_Surface *surface) { (void)surface; }
+void VL_ClearScreen(int c) {
+ memset(screenBuffer, c, screenWidth * screenHeight);
+}
+#else
byte *VL_LockSurface(SDL_Surface *surface)
{
if(SDL_MUSTLOCK(surface))
@@ -415,6 +446,7 @@ void VL_UnlockSurface(SDL_Surface *surface)
SDL_UnlockSurface(surface);
}
}
+#endif
/*
=================
@@ -459,7 +491,11 @@ byte VL_GetPixel (int x, int y)
if (!VL_LockSurface(screenBuffer))
return 0;
+#ifdef EMBEDDED
+ col = screenBuffer[ylookup[y] + x];
+#else
col = ((byte *) screenBuffer->pixels)[ylookup[y] + x];
+#endif
VL_UnlockSurface(screenBuffer);
@@ -717,7 +753,9 @@ void VL_MemToScreenScaledCoord2 (byte *source, int origwidth, int srcx, int srcy
=================
*/
+#ifndef EMBEDDED
void VL_ScreenToScreen (SDL_Surface *source, SDL_Surface *dest)
{
SDL_BlitSurface(source, NULL, dest, NULL);
}
+#endif
diff --git a/id_vl.h b/id_vl.h
index 8fb4851..7816cb8 100644
--- a/id_vl.h
+++ b/id_vl.h
@@ -13,15 +13,21 @@
//===========================================================================
extern SDL_Surface *screen, *screenBuffer;
+#ifndef EMBEDDED
extern SDL_Window *window;
extern SDL_Renderer *renderer;
extern SDL_Texture *texture;
+#endif
extern boolean fullscreen;
extern int16_t screenWidth, screenHeight;
extern unsigned screenPitch, bufferPitch;
extern int screenBits;
+#if EMBEDDED == 2
+#define scaleFactor 1
+#else
extern int scaleFactor;
+#endif
extern boolean screenfaded;
extern unsigned bordercolor;
@@ -37,7 +43,11 @@ extern SDL_Color gamepal[256];
//
#define VL_WaitVBL(a) SDL_Delay((a)*8)
+#ifdef EMBEDDED
+void VL_ClearScreen(int c);
+#else
#define VL_ClearScreen(c) SDL_FillRect(screenBuffer,NULL,(c))
+#endif
void VL_DePlaneVGA (byte *source, int width, int height);
void VL_SetVGAPlaneMode (void);
diff --git a/version.h b/version.h
index 791e595..f36a71d 100644
--- a/version.h
+++ b/version.h
@@ -48,7 +48,9 @@
//#define VIEWMAP // Enables the overhead map
//#define REVEALMAP // Enables showing only the areas of the overhead map that have been seen
+#if 0
#define DEBUGKEYS // Comment this out to compile without the Tab debug keys
+#endif
#define ARTSEXTERN
#define DEMOSEXTERN
#define PLAYDEMOLIKEORIGINAL // When playing or recording demos, several bug fixes do not take
diff --git a/wl_act1.c b/wl_act1.c
index f49f80f..cbd2d83 100644
--- a/wl_act1.c
+++ b/wl_act1.c
@@ -22,6 +22,10 @@ typedef struct
uint32_t specialFlags; // they are ORed to the statobj_t flags
} statinfo_t;
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
statinfo_t statinfo[] =
{
{SPR_STAT_0}, // puddle spr1v
@@ -121,6 +125,9 @@ statinfo_t statinfo[] =
#endif
{-1} // terminator
};
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
/*
===============
diff --git a/wl_act2.c b/wl_act2.c
index 0678042..4afcf37 100644
--- a/wl_act2.c
+++ b/wl_act2.c
@@ -1644,10 +1644,14 @@ void T_Launch (objtype *ob)
deltax = player->x - ob->x;
deltay = ob->y - player->y;
+#ifdef EMBEDDED
+ iangle = CalcAngle (deltay, deltax);
+#else
angle = (float) atan2 ((float) deltay, (float) deltax);
if (angle<0)
angle = (float) (M_PI*2+angle);
iangle = (int) (angle/(M_PI*2)*ANGLES);
+#endif
if (ob->obclass == deathobj)
{
T_Shoot (ob);
@@ -2316,10 +2320,14 @@ void T_SchabbThrow (objtype *ob)
deltax = player->x - ob->x;
deltay = ob->y - player->y;
+#ifdef EMBEDDED
+ iangle = CalcAngle (deltay, deltax);
+#else
angle = (float) atan2((float) deltay, (float) deltax);
if (angle<0)
angle = (float) (M_PI*2+angle);
iangle = (int) (angle/(M_PI*2)*ANGLES);
+#endif
newobj = GetNewActor();
newobj->state = &s_needle1;
@@ -2357,10 +2365,14 @@ void T_GiftThrow (objtype *ob)
deltax = player->x - ob->x;
deltay = ob->y - player->y;
+#ifdef EMBEDDED
+ iangle = CalcAngle (deltay, deltax);
+#else
angle = (float) atan2((float) deltay, (float) deltax);
if (angle<0)
angle = (float) (M_PI*2+angle);
iangle = (int) (angle/(M_PI*2)*ANGLES);
+#endif
newobj = GetNewActor();
newobj->state = &s_rocket;
@@ -2956,10 +2968,14 @@ void T_FakeFire (objtype *ob)
deltax = player->x - ob->x;
deltay = ob->y - player->y;
+#ifdef EMBEDDED
+ iangle = CalcAngle (deltay, deltax);
+#else
angle = (float) atan2((float) deltay, (float) deltax);
if (angle<0)
angle = (float)(M_PI*2+angle);
iangle = (int) (angle/(M_PI*2)*ANGLES);
+#endif
newobj = GetNewActor();
newobj->state = &s_fire1;
@@ -3856,11 +3872,15 @@ void A_StartDeathCam (objtype *ob)
dx = ob->x - player->x;
dy = player->y - ob->y;
+#ifdef EMBEDDED
+ player->angle = CalcAngle (dy, dx);
+#else
fangle = (float) atan2((float) dy, (float) dx); // returns -pi to pi
if (fangle<0)
fangle = (float) (M_PI*2+fangle);
player->angle = (short) (fangle/(M_PI*2)*ANGLES);
+#endif
//
// try to position as close as possible without being in a wall
diff --git a/wl_debug.c b/wl_debug.c
index ae6c1b8..b6bf702 100644
--- a/wl_debug.c
+++ b/wl_debug.c
@@ -326,11 +326,13 @@ void ShapeTest (void)
//
// display sound info
//
+#if !NO_SOUND
US_Print ("\n\n Number of sounds: ");
US_PrintUnsigned (NumDigi);
for (l = j = 0; j < NumDigi; j++)
l += DigiList[j].length;
+#endif
US_Print ("\n Total bytes: ");
US_PrintUnsigned (l);
@@ -342,6 +344,7 @@ void ShapeTest (void)
//
// display sounds
//
+#if !NO_SOUND
for (j = 0; j < NumDigi; j++)
{
if (j == NumDigi - 1)
@@ -362,6 +365,7 @@ void ShapeTest (void)
US_Print ("\n Segment #");
US_PrintSigned (i - PMSoundStart - DigiList[j].startpage);
}
+#endif
for (j = 0; j < pageLengths[i]; j += 32)
{
@@ -1059,7 +1063,7 @@ void OverheadRefresh (void)
VL_UnlockSurface (screenBuffer);
vbuf = NULL;
- VH_UpdateScreen (screenBuffer);
+ VW_UpdateScreenEx (1);
}
diff --git a/wl_def.h b/wl_def.h
index a45a551..153f44e 100644
--- a/wl_def.h
+++ b/wl_def.h
@@ -21,13 +21,24 @@
# include <string.h>
# include <stdarg.h>
#endif
+#ifdef EMBEDDED
+#include "wlsys_def.h"
+#else
#include <SDL.h>
+#endif
#if !defined O_BINARY
# define O_BINARY 0
#endif
+#if 0
#pragma pack(1)
+#endif
+#ifdef __GNUC__
+#define PACKED __attribute__((packed))
+#else
+#define PACKED
+#endif
#if defined(_arch_dreamcast)
#define YESBUTTONNAME "A"
@@ -1486,6 +1497,13 @@ void GP2X_ButtonUp (int button);
#define ISPOINTER(x) ((((uintptr_t)(x)) & ~0xffff) != 0)
#ifndef _WIN32
+#if 1
+static inline char *itoa(int value, char *string, int radix) {
+ sprintf(string,"%d",value);
+ return string;
+}
+#define ltoa itoa
+#else /* What the hell is this? */
static inline char *itoa (int value, char *string, int radix)
{
int len = strlen(string) + 1;
@@ -1504,6 +1522,7 @@ void GP2X_ButtonUp (int button);
return string;
}
#endif
+#endif
/*
diff --git a/wl_draw.c b/wl_draw.c
index 5dd58a5..0a1f874 100644
--- a/wl_draw.c
+++ b/wl_draw.c
@@ -43,8 +43,12 @@ int16_t *wallheight;
// math tables
//
short *pixelangle;
+#if NO_FLOAT
+#include "wolf3d_tables.h"
+#else
int32_t finetangent[FINEANGLES/4];
fixed sintable[ANGLES+ANGLES/4];
+#endif
fixed *costable = sintable+(ANGLES/4);
//
@@ -649,11 +653,17 @@ int CalcRotate (objtype *ob)
// this isn't exactly correct, as it should vary by a trig value,
// but it is close enough with only eight rotations
+#ifdef EMBEDDED
+ viewangle = (centerx - ob->viewx) * CalcRotateMult;