diff Render.h @ 1525:863de6ec906b

Слияние
author Ritor1
date Thu, 05 Sep 2013 13:31:15 +0600
parents af57b3b76fe4
children 75fafd8ced59
line wrap: on
line diff
--- a/Render.h	Thu Sep 05 13:12:53 2013 +0600
+++ b/Render.h	Thu Sep 05 13:31:15 2013 +0600
@@ -1,5 +1,7 @@
 #pragma once
-#include <stdio.h>
+
+#include <cstdint>
+#include <cstdio>
 
 #include "lib\legacy_dx\d3d.h"
 #include "OSAPI.h"
@@ -169,7 +171,7 @@
   HWLTexture *LoadTexture(const char *pName, int bMipMaps);
 
   FILE *pFile;
-  uint  uSignature;
+  uint32_t uSignature;
   unsigned int uDataOffset;
   unsigned int uNumItems;
   char *pSpriteNames[50000];
@@ -267,8 +269,8 @@
 
   static Render *Create() {return new Render;}
 
-  bool Initialize(bool bWindowed, uint uDefaultDevice,
-                  bool bColoredLights, uint uDetailLevel, uint bTinting);
+  bool Initialize(bool bWindowed, uint32_t uDefaultDevice,
+                  bool bColoredLights, uint32_t uDetailLevel, bool bTinting);
 
 
   bool IsColorKeySupported(IDirectDraw4 *);
@@ -435,7 +437,7 @@
   unsigned int uMinDeviceTextureDim;
   int field_10365C;
   unsigned int bUsingSpecular;
-  uint uFogColor;
+  uint32_t uFogColor;
   int field_103668;
   unsigned int pHDWaterBitmapIDs[7];
   char field_103688[32];
@@ -447,7 +449,7 @@
   int _gpu_memory_used;
   void ( *pBeforePresentFunction)();
   int field_1036C4;
-  uint bFogEnabled;
+  uint32_t bFogEnabled;
   int field_1036CC;
   RenderBillboardD3D pBillboardRenderListD3D[1000];
   unsigned int uNumBillboardsToDraw;