Remove al_compat references

adventuregamestudio · Feb 12, 2019 · 17b1758 · 17b1758
1 parent df97b06
commit 17b1758
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/Engine/ac/screen.cpp b/Engine/ac/screen.cpp
@@ -36,7 +36,7 @@ extern GameState play;
 extern IGraphicsDriver *gfxDriver;
 extern AGSPlatformDriver *platform;
 
-void my_fade_in(PALLETE p, int speed) {
+void my_fade_in(PALETTE p, int speed) {
     if (game.color_depth > 1) {
         set_palette (p);
 

diff --git a/Engine/ac/screen.h b/Engine/ac/screen.h
@@ -21,7 +21,7 @@
 namespace AGS { namespace Common { class Bitmap; } }
 namespace AGS { namespace Engine { class IDriverDependantBitmap; } }
 
-void my_fade_in(PALLETE p, int speed);
+void my_fade_in(PALETTE p, int speed);
 void current_fade_out_effect ();
 AGS::Engine::IDriverDependantBitmap* prepare_screen_for_transition_in();
 

diff --git a/Engine/gfx/ali3dogl.cpp b/Engine/gfx/ali3dogl.cpp
@@ -1821,7 +1821,7 @@ void OGLGraphicsDriver::FadeOut(int speed, int targetColourRed, int targetColour
   do_fade(true, speed, targetColourRed, targetColourGreen, targetColourBlue);
 }
 
-void OGLGraphicsDriver::FadeIn(int speed, PALLETE p, int targetColourRed, int targetColourGreen, int targetColourBlue) 
+void OGLGraphicsDriver::FadeIn(int speed, PALETTE p, int targetColourRed, int targetColourGreen, int targetColourBlue) 
 {
   do_fade(false, speed, targetColourRed, targetColourGreen, targetColourBlue);
 }

diff --git a/Engine/gfx/ali3dsw.cpp b/Engine/gfx/ali3dsw.cpp
@@ -707,30 +707,30 @@ void initialize_fade_256(int r, int g, int b) {
   }
 }
 
-void ALSoftwareGraphicsDriver::__fade_from_range(PALLETE source, PALLETE dest, int speed, int from, int to) 
+void ALSoftwareGraphicsDriver::__fade_from_range(PALETTE source, PALETTE dest, int speed, int from, int to) 
 {
-   PALLETE temp;
+   PALETTE temp;
    int c;
 
    for (c=0; c<PAL_SIZE; c++)
       temp[c] = source[c];
 
    for (c=0; c<64; c+=speed) {
       fade_interpolate(source, dest, temp, c, from, to);
-      set_pallete_range(temp, from, to, TRUE);
+      set_palette_range(temp, from, to, TRUE);
       if (_pollingCallback) _pollingCallback();
-      set_pallete_range(temp, from, to, TRUE);
+      set_palette_range(temp, from, to, TRUE);
    }
 
-   set_pallete_range(dest, from, to, TRUE);
+   set_palette_range(dest, from, to, TRUE);
 }
 
 void ALSoftwareGraphicsDriver::__fade_out_range(int speed, int from, int to, int targetColourRed, int targetColourGreen, int targetColourBlue) 
 {
-   PALLETE temp;
+   PALETTE temp;
 
    initialize_fade_256(targetColourRed, targetColourGreen, targetColourBlue);
-   get_pallete(temp);
+   get_palette(temp);
    __fade_from_range(temp, faded_out_palette, speed, from, to);
 }
 
@@ -744,7 +744,7 @@ void ALSoftwareGraphicsDriver::FadeOut(int speed, int targetColourRed, int targe
 
 }
 
-void ALSoftwareGraphicsDriver::FadeIn(int speed, PALLETE p, int targetColourRed, int targetColourGreen, int targetColourBlue) {
+void ALSoftwareGraphicsDriver::FadeIn(int speed, PALETTE p, int targetColourRed, int targetColourGreen, int targetColourBlue) {
   if (_mode.ColorDepth > 8) {
 
     highcolor_fade_in(virtualScreen, speed * 4, targetColourRed, targetColourGreen, targetColourBlue);

diff --git a/Engine/gfx/ali3dsw.h b/Engine/gfx/ali3dsw.h
@@ -237,7 +237,7 @@ class ALSoftwareGraphicsDriver : public GraphicsDriverBase
 
     void highcolor_fade_out(int speed, int targetColourRed, int targetColourGreen, int targetColourBlue);
     void highcolor_fade_in(Bitmap *bmp_orig, int speed, int targetColourRed, int targetColourGreen, int targetColourBlue);
-    void __fade_from_range(PALLETE source, PALLETE dest, int speed, int from, int to) ;
+    void __fade_from_range(PALETTE source, PALETTE dest, int speed, int from, int to) ;
     void __fade_out_range(int speed, int from, int to, int targetColourRed, int targetColourGreen, int targetColourBlue) ;
     int  GetAllegroGfxDriverID(bool windowed);
 };

diff --git a/Engine/platform/windows/gfx/ali3dd3d.cpp b/Engine/platform/windows/gfx/ali3dd3d.cpp
@@ -1803,7 +1803,7 @@ void D3DGraphicsDriver::FadeOut(int speed, int targetColourRed, int targetColour
   do_fade(true, speed, targetColourRed, targetColourGreen, targetColourBlue);
 }
 
-void D3DGraphicsDriver::FadeIn(int speed, PALLETE p, int targetColourRed, int targetColourGreen, int targetColourBlue) 
+void D3DGraphicsDriver::FadeIn(int speed, PALETTE p, int targetColourRed, int targetColourGreen, int targetColourBlue) 
 {
   do_fade(false, speed, targetColourRed, targetColourGreen, targetColourBlue);
 }