Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anton Retro Jr.
SRB2
Commits
f59c8d20
Commit
f59c8d20
authored
Feb 11, 2016
by
toaster
Committed by
Alam Ed Arias
Feb 11, 2016
Browse files
Options
Downloads
Patches
Plain Diff
fix md2 blendcolors for reduced palette
parent
9470fc55
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/hardware/hw_md2.c
+59
-69
59 additions, 69 deletions
src/hardware/hw_md2.c
with
59 additions
and
69 deletions
src/hardware/hw_md2.c
+
59
−
69
View file @
f59c8d20
...
@@ -1145,119 +1145,109 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
...
@@ -1145,119 +1145,109 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
case
SKINCOLOR_BLACK
:
case
SKINCOLOR_BLACK
:
blendcolor
=
V_GetColor
(
27
);
blendcolor
=
V_GetColor
(
27
);
break
;
break
;
case
SKINCOLOR_
CYAN
:
case
SKINCOLOR_
BEIGE
:
blendcolor
=
V_GetColor
(
2
15
);
blendcolor
=
V_GetColor
(
2
47
);
break
;
break
;
case
SKINCOLOR_
T
EA
L
:
case
SKINCOLOR_
P
EA
CH
:
blendcolor
=
V_GetColor
(
2
2
1
);
blendcolor
=
V_GetColor
(
21
8
);
break
;
break
;
case
SKINCOLOR_
STEELBLUE
:
case
SKINCOLOR_
BROWN
:
blendcolor
=
V_GetColor
(
2
0
3
);
blendcolor
=
V_GetColor
(
23
4
);
break
;
break
;
case
SKINCOLOR_
BLUE
:
case
SKINCOLOR_
RED
:
blendcolor
=
V_GetColor
(
232
);
blendcolor
=
V_GetColor
(
38
);
break
;
break
;
case
SKINCOLOR_PEACH
:
case
SKINCOLOR_CRIMSON
:
blendcolor
=
V_GetColor
(
71
);
blendcolor
=
V_GetColor
(
45
);
break
;
case
SKINCOLOR_ORANGE
:
blendcolor
=
V_GetColor
(
54
);
break
;
case
SKINCOLOR_RUST
:
blendcolor
=
V_GetColor
(
60
);
break
;
case
SKINCOLOR_GOLD
:
blendcolor
=
V_GetColor
(
67
);
break
;
case
SKINCOLOR_YELLOW
:
blendcolor
=
V_GetColor
(
73
);
break
;
break
;
case
SKINCOLOR_TAN
:
case
SKINCOLOR_TAN
:
blendcolor
=
V_GetColor
(
79
);
blendcolor
=
V_GetColor
(
85
);
break
;
break
;
case
SKINCOLOR_
PINK
:
case
SKINCOLOR_
MOSS
:
blendcolor
=
V_GetColor
(
147
);
blendcolor
=
V_GetColor
(
92
);
break
;
break
;
case
SKINCOLOR_
LAVENDER
:
case
SKINCOLOR_
PERIDOT
:
blendcolor
=
V_GetColor
(
251
);
blendcolor
=
V_GetColor
(
188
);
break
;
break
;
case
SKINCOLOR_
PURPLE
:
case
SKINCOLOR_
GREEN
:
blendcolor
=
V_GetColor
(
1
95
);
blendcolor
=
V_GetColor
(
1
01
);
break
;
break
;
case
SKINCOLOR_
ORANGE
:
case
SKINCOLOR_
EMERALD
:
blendcolor
=
V_GetColor
(
87
);
blendcolor
=
V_GetColor
(
112
);
break
;
break
;
case
SKINCOLOR_
ROSEWOOD
:
case
SKINCOLOR_
AQUA
:
blendcolor
=
V_GetColor
(
94
);
blendcolor
=
V_GetColor
(
122
);
break
;
break
;
case
SKINCOLOR_
BEIGE
:
case
SKINCOLOR_
TEAL
:
blendcolor
=
V_GetColor
(
40
);
blendcolor
=
V_GetColor
(
141
);
break
;
break
;
case
SKINCOLOR_
BROW
N
:
case
SKINCOLOR_
CYA
N
:
blendcolor
=
V_GetColor
(
57
);
blendcolor
=
V_GetColor
(
131
);
break
;
break
;
case
SKINCOLOR_
RED
:
case
SKINCOLOR_
BLUE
:
blendcolor
=
V_GetColor
(
1
30
);
blendcolor
=
V_GetColor
(
1
52
);
break
;
break
;
case
SKINCOLOR_
DARK
RE
D
:
case
SKINCOLOR_
AZU
RE
:
blendcolor
=
V_GetColor
(
1
39
);
blendcolor
=
V_GetColor
(
1
71
);
break
;
break
;
case
SKINCOLOR_
NEONGREEN
:
case
SKINCOLOR_
PASTEL
:
blendcolor
=
V_GetColor
(
1
84
);
blendcolor
=
V_GetColor
(
1
61
);
break
;
break
;
case
SKINCOLOR_
GREEN
:
case
SKINCOLOR_
PURPLE
:
blendcolor
=
V_GetColor
(
16
6
);
blendcolor
=
V_GetColor
(
16
5
);
break
;
break
;
case
SKINCOLOR_
ZIM
:
case
SKINCOLOR_
LAVENDER
:
blendcolor
=
V_GetColor
(
1
80
);
blendcolor
=
V_GetColor
(
1
95
);
break
;
break
;
case
SKINCOLOR_
OLIVE
:
case
SKINCOLOR_
MAGENTA
:
blendcolor
=
V_GetColor
(
1
0
8
);
blendcolor
=
V_GetColor
(
18
3
);
break
;
break
;
case
SKINCOLOR_
YELLOW
:
case
SKINCOLOR_
PINK
:
blendcolor
=
V_GetColor
(
104
);
blendcolor
=
V_GetColor
(
211
);
break
;
break
;
case
SKINCOLOR_
GOLD
:
case
SKINCOLOR_
ROSY
:
blendcolor
=
V_GetColor
(
115
);
blendcolor
=
V_GetColor
(
202
);
break
;
break
;
case
SKINCOLOR_SUPER1
:
case
SKINCOLOR_SUPER1
:
blendcolor
=
V_GetColor
(
97
);
blendcolor
=
V_GetColor
(
80
);
break
;
break
;
case
SKINCOLOR_SUPER2
:
case
SKINCOLOR_SUPER2
:
blendcolor
=
V_GetColor
(
100
);
blendcolor
=
V_GetColor
(
83
);
break
;
break
;
case
SKINCOLOR_SUPER3
:
case
SKINCOLOR_SUPER3
:
blendcolor
=
V_GetColor
(
10
3
);
blendcolor
=
V_GetColor
(
7
3
);
break
;
break
;
case
SKINCOLOR_SUPER4
:
case
SKINCOLOR_SUPER4
:
blendcolor
=
V_GetColor
(
113
);
blendcolor
=
V_GetColor
(
64
);
break
;
break
;
case
SKINCOLOR_SUPER5
:
case
SKINCOLOR_SUPER5
:
blendcolor
=
V_GetColor
(
11
6
);
blendcolor
=
V_GetColor
(
6
7
);
break
;
break
;
case
SKINCOLOR_TSUPER1
:
case
SKINCOLOR_TSUPER1
:
blendcolor
=
V_GetColor
(
81
);
break
;
case
SKINCOLOR_TSUPER2
:
case
SKINCOLOR_TSUPER2
:
blendcolor
=
V_GetColor
(
82
);
break
;
case
SKINCOLOR_TSUPER3
:
case
SKINCOLOR_TSUPER3
:
blendcolor
=
V_GetColor
(
84
);
break
;
case
SKINCOLOR_TSUPER4
:
case
SKINCOLOR_TSUPER4
:
blendcolor
=
V_GetColor
(
85
);
break
;
case
SKINCOLOR_TSUPER5
:
case
SKINCOLOR_TSUPER5
:
blendcolor
=
V_GetColor
(
87
);
break
;
case
SKINCOLOR_KSUPER1
:
case
SKINCOLOR_KSUPER1
:
blendcolor
=
V_GetColor
(
122
);
break
;
case
SKINCOLOR_KSUPER2
:
case
SKINCOLOR_KSUPER2
:
blendcolor
=
V_GetColor
(
123
);
break
;
case
SKINCOLOR_KSUPER3
:
case
SKINCOLOR_KSUPER3
:
blendcolor
=
V_GetColor
(
124
);
break
;
case
SKINCOLOR_KSUPER4
:
case
SKINCOLOR_KSUPER4
:
blendcolor
=
V_GetColor
(
125
);
break
;
case
SKINCOLOR_KSUPER5
:
case
SKINCOLOR_KSUPER5
:
blendcolor
=
V_GetColor
(
126
);
break
;
default:
default:
blendcolor
=
V_GetColor
(
2
47
);
blendcolor
=
V_GetColor
(
2
55
);
break
;
break
;
}
}
...
...
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