소스 검색

Updated a bit the parser reader.

Eiyeron Fulmincendii 9 년 전
부모
커밋
c0c3945357
2개의 변경된 파일40개의 추가작업 그리고 39개의 파일을 삭제
  1. 34 33
      src/map/StateMap.cpp
  2. 6 6
      src/render/Font.cpp

+ 34 - 33
src/map/StateMap.cpp

@@ -113,39 +113,40 @@ namespace
         /*126*/ {7, 40, 5, 2, 0, 5},
         /*127*/ {65, 6, 5, 5, 0, 4},
         /*uncovered by littera for now*/
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        /*338*/ {22, 26, 6, 6, 0, 3},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        /*339*/ {32, 25, 6, 5, 0, 4},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {7, 42, 5, 8, 0, 1},
-        {0, 0, 0, 0, 0, 0},
+        /*128*/ {0, 0, 0, 0, 0, 0},
+        /*129*/ {0, 0, 0, 0, 0, 0},
+        /*130*/ {0, 0, 0, 0, 0, 0},
+        /*131*/ {0, 0, 0, 0, 0, 0},
+        /*132*/ {0, 0, 0, 0, 0, 0},
+        /*133*/ {0, 0, 0, 0, 0, 0},
+        /*134*/ {0, 0, 0, 0, 0, 0},
+        /*135*/ {0, 0, 0, 0, 0, 0},
+        /*136*/ {0, 0, 0, 0, 0, 0},
+        /*137*/ {0, 0, 0, 0, 0, 0},
+        /*138*/ {0, 0, 0, 0, 0, 0},
+        /*139*/ {0, 0, 0, 0, 0, 0},
+        /*140 = 338*/ {22, 26, 6, 6, 0, 3},
+        /*141*/ {0, 0, 0, 0, 0, 0},
+        /*142*/ {0, 0, 0, 0, 0, 0},
+        /*143*/ {0, 0, 0, 0, 0, 0},
+        /*144*/ {0, 0, 0, 0, 0, 0},
+        /*145*/ {0, 0, 0, 0, 0, 0},
+        /*146*/ {0, 0, 0, 0, 0, 0},
+        /*147*/ {0, 0, 0, 0, 0, 0},
+        /*148*/ {0, 0, 0, 0, 0, 0},
+        /*149*/ {0, 0, 0, 0, 0, 0},
+        /*150*/ {0, 0, 0, 0, 0, 0},
+        /*151*/ {0, 0, 0, 0, 0, 0},
+        /*152*/ {0, 0, 0, 0, 0, 0},
+        /*153*/ {0, 0, 0, 0, 0, 0},
+        /*154*/ {0, 0, 0, 0, 0, 0},
+        /*155 = 339*/ {32, 25, 6, 5, 0, 4},
+        /*156*/ {0, 0, 0, 0, 0, 0},
+        /*157*/ {0, 0, 0, 0, 0, 0},
+        /*158*/ {7, 42, 5, 8, 0, 1},
+        /*159*/ {0, 0, 0, 0, 0, 0},
+        /*160*/ {0, 0, 0, 0, 0, 0},
+        // End of Littera Mess
         /*161*/ {0, 48, 1, 6, 0, 4},
         /*162*/ {1, 48, 4, 7, 0, 3},
         /*163*/ {32, 30, 4, 6, 0, 3},

+ 6 - 6
src/render/Font.cpp

@@ -26,12 +26,12 @@ Font::Font(Texture& font_tex, WalrusRPG::PIAF::File font_config)
 	for (int i = 0; i < 256; ++i)
 	{
 		const uint8_t* current_char = ptr + 9 + (6*4+2)*i;
-		chars[i].dimensions.x = read_big_endian_value<signed>(current_char);
-		chars[i].dimensions.y = read_big_endian_value<signed>(current_char+4);
-		chars[i].dimensions.width = read_big_endian_value<unsigned>(current_char+8);
-		chars[i].dimensions.height = read_big_endian_value<unsigned>(current_char+12);
-		chars[i].x_offset = read_big_endian_value<unsigned>(current_char+16);
-		chars[i].y_offset = read_big_endian_value<unsigned>(current_char+18);
+		chars[i].dimensions.x = read_big_endian_value<int16_t>(current_char);
+		chars[i].dimensions.y = read_big_endian_value<int16_t>(current_char+4);
+		chars[i].dimensions.width = read_big_endian_value<uint16_t>(current_char+8);
+		chars[i].dimensions.height = read_big_endian_value<uint16_t>(current_char+12);
+		chars[i].x_offset = read_big_endian_value<uint16_t>(current_char+16);
+		chars[i].y_offset = read_big_endian_value<uint16_t>(current_char+18);
 	}
 }