Skip to content

Commit ab9482c

Browse files
committed
fixed some colors being read incorrectly from terrain.png
1 parent 8d8e152 commit ab9482c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

extractcolors.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ static const int special_sauce[256][3] = {
4343
{ 0, 11, 10 },
4444
{ 10, 4, 10 },
4545
{ 7, 8, 10 },
46-
{ 0, 8, 10 },
47-
{ 0, 8, 10 },
46+
{ 3, 11, 10 },
47+
{ 3, 12, 10 },
4848
{ -1, -1, 10 },
4949
{ -1, -1, 10 }, /* 30 */
5050
{ -1, -1, 10 },
@@ -57,8 +57,8 @@ static const int special_sauce[256][3] = {
5757
{ 12, 0, 10 },
5858
{ 13, 1, 10 },
5959
{ 12, 1, 10 }, /* 40 */
60-
{ 7, 2, 10 },
61-
{ 6, 2, 10 },
60+
{ 7, 1, 10 },
61+
{ 6, 1, 10 },
6262
{ 5, 0, 10 },
6363
{ 5, 0, 10 },
6464
{ 7, 0, 10 },
@@ -71,9 +71,9 @@ static const int special_sauce[256][3] = {
7171
{ 1, 4, 10 },
7272
{ 4, 0, 10 },
7373
{ 11, 1, 10 },
74-
{ 4, 6, 10 },
74+
{ -1, -1, 10 }, // Redstone wire
7575
{ 2, 3, 10 },
76-
{ 8, 2, 10 },
76+
{ 8, 1, 10 },
7777
{ 12, 3, 10 },
7878
{ 15, 5, 10 },
7979
{ 7, 5, 10 }, /* 60 */
@@ -249,7 +249,7 @@ static const int special_sauce[256][3] = {
249249
{ -1, -1, 10 }, /* 230 */
250250
{ -1, -1, 10 },
251251
{ -1, -1, 10 },
252-
{ 9, 11, 10 }, // Sandstone half step
252+
{ 0, 11, 10 }, // Sandstone half step
253253
{ 4, 0, 10 }, // Wooden half step
254254
{ 0, 1, 10 }, // Cooblestone half step
255255
{ 4, 8, 10 }, // Pine leaves (should be darker, more green)

globals.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _GLOBALS_H_
22
#define _GLOBALS_H_
33

4-
#define VERSION "2.0f"
4+
#define VERSION "2.0g"
55

66
#include <stdint.h>
77
#include <cstdlib>

0 commit comments

Comments
 (0)