diff options
| author | Eugene Sandulenko | 2019-01-04 00:22:45 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
| commit | 2364c6b45723351bb1a7af82a9a8eea219a442da (patch) | |
| tree | 090cbe82361bb416575edff11bd287344a1390be /engines/griffon | |
| parent | 8f399b95b3b29358262a832a53d6a18957996582 (diff) | |
| download | scummvm-rg350-2364c6b45723351bb1a7af82a9a8eea219a442da.tar.gz scummvm-rg350-2364c6b45723351bb1a7af82a9a8eea219a442da.tar.bz2 scummvm-rg350-2364c6b45723351bb1a7af82a9a8eea219a442da.zip | |
GRIFFON: Simplify code
Diffstat (limited to 'engines/griffon')
| -rw-r--r-- | engines/griffon/engine.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp index 5d09cd8ed6..5193e8347b 100644 --- a/engines/griffon/engine.cpp +++ b/engines/griffon/engine.cpp @@ -4067,7 +4067,7 @@ void GriffonEngine::game_loadmap(int mapnum) { rcDest.top = y1; rcDest.setWidth(8); rcDest.setHeight(8); - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } else if (d == 6) { sys_line(clipbg, x1 + 7, y1, x1 + 7, y1 + 7, ccc); sys_line(clipbg, x1 + 6, y1, x1 + 6, y1 + 7, ccc); @@ -4132,9 +4132,9 @@ void GriffonEngine::game_loadmap(int mapnum) { rcDest.setHeight(8); if (objectinfo[o][4] == 1) - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); if (objectinfo[o][4] == 3) - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } } if (npc == 1) { @@ -4459,7 +4459,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } // academy crystal @@ -4483,7 +4483,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } // gardens master key @@ -4507,7 +4507,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } // gardens fidelis sword @@ -4531,7 +4531,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } // citadel armour @@ -4555,7 +4555,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } // citadel master key @@ -4579,7 +4579,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } @@ -4604,7 +4604,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } if (curmap == 83 && scriptflag[16][0] == 1 && player.shield < 3) { @@ -4627,7 +4627,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } if (curmap == 83 && scriptflag[17][0] == 1 && player.armour < 3) { @@ -4650,7 +4650,7 @@ void GriffonEngine::game_loadmap(int mapnum) { if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + SDL_FillRect(clipbg, &rcDest, ccc); } SDL_BlitSurface(clipbg, NULL, clipbg2, NULL); |