Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
cookbook
Commits
966f9da2
Commit
966f9da2
authored
6 years ago
by
Nagy Tibor
Browse files
Options
Downloads
Patches
Plain Diff
Fix prboom port
parent
7ec6d099
No related branches found
No related tags found
1 merge request
!143
Fix prboom port
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
recipes/prboom/01_redox.patch
+33
-8
33 additions, 8 deletions
recipes/prboom/01_redox.patch
with
33 additions
and
8 deletions
recipes/prboom/01_redox.patch
+
33
−
8
View file @
966f9da2
diff -
rupN prboom-2.5.0/configure.ac prboom-2.5.0-redox
/configure.ac
diff -
burpN source-original/configure.ac source
/configure.ac
---
prboom-2.5.0
/configure.ac 2008-11-09
11
:12:37.000000000
-08
00
---
source-original
/configure.ac 2008-11-09
20
:12:37.000000000
+01
00
+++
prboom-2.5.0-redox
/configure.ac 201
7-10-14
23:
27
:16.
000000000 -07
00
+++
source
/configure.ac 201
8-04-22
23:
41
:16.
945896818 +02
00
@@ -85,8 +85,6 @@
if test "$cross_compiling" != "yes"; the
@@ -85,8 +85,6 @@
if test "$cross_compiling" != "yes"; the
fi
fi
dnl --- Header files, typedefs, structures
dnl --- Header files, typedefs, structures
-AC_TYPE_UID_T
-AC_TYPE_UID_T
-AC_TYPE_SIZE_T
-AC_TYPE_SIZE_T
AC_DECL_SYS_SIGLIST
AC_DECL_SYS_SIGLIST
AC_HEADER_SYS_WAIT
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(unistd.h asm/byteorder.h sched.h)
AC_CHECK_HEADERS(unistd.h asm/byteorder.h sched.h)
diff -
rupN prboom-2.5.0/src/d_deh.c prboom-2.5.0-redox
/src/d_deh.c
diff -
burpN source-original/src/d_deh.c source
/src/d_deh.c
---
prboom-2.5.0
/src/d_deh.c 2008-10-11
05
:10:38.000000000
-07
00
---
source-original
/src/d_deh.c 2008-10-11
14
:10:38.000000000
+02
00
+++
prboom-2.5.0-redox/src/d_deh.c 2017-10-14 23:29:00.000000000 -07
00
+++
source/src/d_deh.c 2018-04-22 23:41:16.949896859 +02
00
@@ -54,17 +54,6 @@
@@ -54,17 +54,6 @@
#define TRUE 1
#define TRUE 1
#define FALSE 0
#define FALSE 0
-#ifndef HAVE_STRLWR
-#ifndef HAVE_STRLWR
-#include <ctype.h>
-#include <ctype.h>
-
-
...
@@ -30,3 +30,28 @@ diff -rupN prboom-2.5.0/src/d_deh.c prboom-2.5.0-redox/src/d_deh.c
...
@@ -30,3 +30,28 @@ diff -rupN prboom-2.5.0/src/d_deh.c prboom-2.5.0-redox/src/d_deh.c
-
-
// killough 10/98: new functions, to allow processing DEH files in-memory
// killough 10/98: new functions, to allow processing DEH files in-memory
// (e.g. from wads)
// (e.g. from wads)
diff -burpN source-original/src/SDL/i_video.c source/src/SDL/i_video.c
--- source-original/src/SDL/i_video.c 2008-10-18 15:32:29.000000000 +0200
+++ source/src/SDL/i_video.c 2018-04-23 00:51:18.944949507 +0200
@@ -407,7 +407,7 @@
void I_FinishUpdate (void)
I_UploadNewPalette(newpal);
newpal = NO_PALETTE_CHANGE;
}
- SDL_Flip(screen);
+ SDL_UpdateRect(screen, 0, 0, screen->w, screen->h);
}
//
diff -burpN source-original/src/v_video.c source/src/v_video.c
--- source-original/src/v_video.c 2008-10-11 14:10:41.000000000 +0200
+++ source/src/v_video.c 2018-04-22 23:43:10.939034965 +0200
@@ -558,7 +558,7 @@
void V_UpdateTrueColorPalette(video_mode
ng = (int)(g*t+roundUpG);
nb = (int)(b*t+roundUpB);
Palettes32[((p*256+i)*VID_NUMCOLORWEIGHTS)+w] = (
- (nr<<16) | (ng<<8) | nb
+ (255<<24) | (nr<<16) | (ng<<8) | nb
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment