Prechádzať zdrojové kódy

Merge doom from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	doom/assets.h
#	doom/display.h
Willy-JL 1 rok pred
rodič
commit
c176f6736f
3 zmenil súbory, kde vykonal 3 pridanie a 3 odobranie
  1. 1 1
      doom/application.fam
  2. 1 1
      doom/assets.h
  3. 1 1
      doom/display.h

+ 1 - 1
doom/application.fam

@@ -13,6 +13,6 @@ App(
     fap_category="Games",
     fap_icon_assets="assets",
     fap_author="@xMasterX & @Svarich & @hedger (original code by @p4nic4ttack)",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_description="Will it run Doom?",
 )

+ 1 - 1
doom/assets.h

@@ -9,7 +9,7 @@
 #define bmp_font_width_pxs 192
 #define bmp_font_height_pxs 48
 #define CHAR_MAP " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ.,-_(){}[]#"
-#define _CHAR_WIDTH 4
+#define UICHAR_WIDTH 4
 #define CHAR_HEIGHT 6
 
 #define BMP_GUN_WIDTH 32

+ 1 - 1
doom/display.h

@@ -117,7 +117,7 @@ void drawTextSpace(int8_t x, int8_t y, char* txt, uint8_t space, Canvas* const c
     while((ch = txt[i]) != '\0') {
         drawChar(pos, y, ch, canvas);
         i++;
-        pos += _CHAR_WIDTH + space;
+        pos += UICHAR_WIDTH + space;
 
         // shortcut on end of screen
         if(pos > SCREEN_WIDTH) return;