Fixed minor font (story text images) and sprite (ending seq ep 1) issues
git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@212 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
This commit is contained in:
@@ -651,7 +651,7 @@ void CGraphics::sb_font_draw(const std::string& text, int xoff, int yoff)
|
|||||||
{
|
{
|
||||||
if (text[i]!=13)
|
if (text[i]!=13)
|
||||||
{
|
{
|
||||||
sb_drawCharacter(x, y, text[i]);
|
sb_drawCharacter(x, y, (unsigned char)text[i]);
|
||||||
x+=8;
|
x+=8;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ int scrollingon;
|
|||||||
|
|
||||||
scrollingon = 1;
|
scrollingon = 1;
|
||||||
|
|
||||||
#define MARK_SPR_NUM 5
|
#define MARK_SPR_NUM 2
|
||||||
initgame(pCKP);
|
initgame(pCKP);
|
||||||
|
|
||||||
// set up the ship's route
|
// set up the ship's route
|
||||||
|
|||||||
@@ -970,7 +970,7 @@ void showPage(const std::string& str_text, stCloneKeenPlus *pCKP, int textsize)
|
|||||||
dlgH = 15;
|
dlgH = 15;
|
||||||
|
|
||||||
textpos=0;
|
textpos=0;
|
||||||
memset(buffer,0,200*40*sizeof(char));
|
memset(buffer,0,200*40);
|
||||||
// Prepare the buffer
|
// Prepare the buffer
|
||||||
|
|
||||||
char sbuf[256];
|
char sbuf[256];
|
||||||
@@ -1004,7 +1004,7 @@ void showPage(const std::string& str_text, stCloneKeenPlus *pCKP, int textsize)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
buffer[i][j]=text[textpos];
|
buffer[i][j] = text[textpos];
|
||||||
textpos++;
|
textpos++;
|
||||||
if(textpos >= textsize)
|
if(textpos >= textsize)
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ bool CEGALatch::loadData(const std::string& filename, bool compresseddata)
|
|||||||
0);
|
0);
|
||||||
|
|
||||||
// Load 8x8 Tiles
|
// Load 8x8 Tiles
|
||||||
unsigned char c=0;
|
int c=0;
|
||||||
for(int p=0;p<4;p++)
|
for(int p=0;p<4;p++)
|
||||||
{
|
{
|
||||||
for(int t=0;t<m_fonttiles;t++)
|
for(int t=0;t<m_fonttiles;t++)
|
||||||
|
|||||||
@@ -6,22 +6,21 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "CPlanes.h"
|
#include "CPlanes.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
|
||||||
// Constructor initializes the positions,getbit will retrieve data from
|
// Constructor initializes the positions,getbit will retrieve data from
|
||||||
CPlanes::CPlanes(unsigned long p1, unsigned long p2, unsigned long p3,\
|
CPlanes::CPlanes(unsigned long p1, unsigned long p2, unsigned long p3,
|
||||||
unsigned long p4, unsigned long p5) {
|
unsigned long p4, unsigned long p5) {
|
||||||
int i;
|
|
||||||
getbit_bytepos[0] = p1;
|
getbit_bytepos[0] = p1;
|
||||||
getbit_bytepos[1] = p2;
|
getbit_bytepos[1] = p2;
|
||||||
getbit_bytepos[2] = p3;
|
getbit_bytepos[2] = p3;
|
||||||
getbit_bytepos[3] = p4;
|
getbit_bytepos[3] = p4;
|
||||||
getbit_bytepos[4] = p5;
|
getbit_bytepos[4] = p5;
|
||||||
|
|
||||||
for(i=0;i<=4;i++)
|
for(int i=0;i<5;i++)
|
||||||
{
|
|
||||||
getbit_bitmask[i] = 128;
|
getbit_bitmask[i] = 128;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// retrieves a bit from plane "plane". the positions of the planes
|
// retrieves a bit from plane "plane". the positions of the planes
|
||||||
@@ -35,7 +34,6 @@ unsigned char CPlanes::getbit(char *buf, unsigned char plane)
|
|||||||
getbit_bitmask[plane] = 128;
|
getbit_bitmask[plane] = 128;
|
||||||
getbit_bytepos[plane]++;
|
getbit_bytepos[plane]++;
|
||||||
}
|
}
|
||||||
|
|
||||||
byt = buf[getbit_bytepos[plane]];
|
byt = buf[getbit_bytepos[plane]];
|
||||||
|
|
||||||
if (byt & getbit_bitmask[plane])
|
if (byt & getbit_bitmask[plane])
|
||||||
|
|||||||
Reference in New Issue
Block a user