From 8c014802c902279a435fcd0d0d4ab7d4b1acff51 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 11 May 2021 15:26:38 -0500
Subject: [PATCH] convert chars to signed/unsigned

---
 CMakeLists.txt            | 2 +-
 src/engine/engine.cpp     | 2 +-
 src/engine/instrument.h   | 6 +++---
 src/engine/orders.h       | 2 +-
 src/engine/pattern.h      | 6 +++---
 src/engine/safeReader.cpp | 6 +++---
 src/engine/safeReader.h   | 2 +-
 src/engine/sample.h       | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 917350118..731e5e87e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ set(ENGINE_SOURCES src/log.cpp src/engine/safeReader.cpp src/engine/engine.cpp)
 add_executable(divorce ${ENGINE_SOURCES} ${AUDIO_SOURCES}
 src/main.cpp)
 
-target_link_libraries(divorce ${HAVE_SDL2} z GL GLEW)
+target_link_libraries(divorce ${HAVE_SDL2} z)
 
 if (HAVE_JACK)
   target_link_libraries(divorce ${HAVE_JACK})
diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index bb20de5bc..6783629e5 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -192,7 +192,7 @@ bool DivEngine::load(void* f, size_t slen) {
     }
     ds.version=reader.readC();
     logI("module version %d (0x%.2x)\n",ds.version,ds.version);
-    char sys=0;
+    unsigned char sys=0;
     if (ds.version<0x09) {
       // V E R S I O N  -> 3 <-
       // AWESOME
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index d72a90193..a048960dd 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -6,10 +6,10 @@ enum DivInstrumentType {
 };
 
 struct DivInstrumentFM {
-  char alg, fb, fms, ams, ops;
+  unsigned char alg, fb, fms, ams, ops;
   struct {
-    char am, ar, dr, mult, rr, sl, tl, dt2, rs, dt, d2r, ssgEnv;
-    char dam, dvb, egt, ksl, sus, vib, ws, ksr; // YMU759
+    unsigned char am, ar, dr, mult, rr, sl, tl, dt2, rs, dt, d2r, ssgEnv;
+    unsigned char dam, dvb, egt, ksl, sus, vib, ws, ksr; // YMU759
   } op[4];
 };
 
diff --git a/src/engine/orders.h b/src/engine/orders.h
index ba2e85829..c9f610a79 100644
--- a/src/engine/orders.h
+++ b/src/engine/orders.h
@@ -1,3 +1,3 @@
 struct DivOrders {
-  char ord[32][128];
+  unsigned char ord[32][128];
 };
diff --git a/src/engine/pattern.h b/src/engine/pattern.h
index a9ce417b7..5eb09024f 100644
--- a/src/engine/pattern.h
+++ b/src/engine/pattern.h
@@ -1,9 +1,9 @@
 struct DivPattern {
-  char data[256][16];
+  unsigned char data[256][16];
 };
 
 struct DivChannelData {
-  char effectRows;
+  unsigned char effectRows;
   // data goes as follows: data[ROW][TYPE]
   // TYPE is:
   // 0: note
@@ -12,4 +12,4 @@ struct DivChannelData {
   // 3: volume
   // 4-5+: effect/effect value
   std::vector<DivPattern*> data;
-};
\ No newline at end of file
+};
diff --git a/src/engine/safeReader.cpp b/src/engine/safeReader.cpp
index 474efe0cc..97574789b 100644
--- a/src/engine/safeReader.cpp
+++ b/src/engine/safeReader.cpp
@@ -47,7 +47,7 @@ int SafeReader::read(void* where, size_t count) {
   return count;
 }
 
-char SafeReader::readC() {
+signed char SafeReader::readC() {
 #ifdef READ_DEBUG
   logD("SR: reading char %x:\n",curSeek);
 #endif
@@ -126,7 +126,7 @@ String SafeReader::readString(size_t stlen) {
 #endif
   size_t curPos=0;
   while (curPos<stlen) {
-    char c=readC();
+    unsigned char c=readC();
     if (c!=0) ret.push_back(c);
     curPos++;
   }
@@ -135,7 +135,7 @@ String SafeReader::readString(size_t stlen) {
 
 String SafeReader::readString() {
   String ret;
-  char c;
+  unsigned char c;
   while ((c=readC())!=0) {
     ret.push_back(c);
   }
diff --git a/src/engine/safeReader.h b/src/engine/safeReader.h
index a922f3451..27bf01c44 100644
--- a/src/engine/safeReader.h
+++ b/src/engine/safeReader.h
@@ -28,7 +28,7 @@ class SafeReader {
     int read(void* where, size_t count);
 
     // these functions may throw EndOfFileException.
-    char readC();
+    signed char readC();
     short readS();
     short readS_BE();
     int readI();
diff --git a/src/engine/sample.h b/src/engine/sample.h
index 0be271b2a..c4675a19e 100644
--- a/src/engine/sample.h
+++ b/src/engine/sample.h
@@ -1,7 +1,7 @@
 struct DivSample {
   String name;
   int length, rate;
-  char vol, pitch, depth;
+  signed char vol, pitch;
+  unsigned char depth;
   short* data;
-  char* data8;
 };