remove unused variables

This commit is contained in:
Chris Cromer 2019-05-01 18:12:24 -04:00
parent 17a570b5c1
commit 39fe98c900
Signed by: cromer
GPG Key ID: 39CC813FF3C8708A
6 changed files with 146 additions and 161 deletions

View File

@ -1180,10 +1180,10 @@ static unsigned int input_code(byte **input)
static void expand(byte *input, byte *output, int fileLength) static void expand(byte *input, byte *output, int fileLength)
{ {
int next_code, new_code, old_code; int next_code, new_code, old_code;
int character, /* counter=0, index, */ BITSFull /*, i */; int character /* counter=0, index, */ /*, i */;
byte *string, *endAddr; byte *string, *endAddr;
BITSFull = setBITS(START_BITS); /* Starts at 9-bits */ setBITS(START_BITS); /* Starts at 9-bits */
next_code = 257; /* Next available code to define */ next_code = 257; /* Next available code to define */
endAddr = (byte *)((long)output + (long)fileLength); endAddr = (byte *)((long)output + (long)fileLength);
@ -1196,7 +1196,7 @@ static void expand(byte *input, byte *output, int fileLength)
if (new_code == 0x100) { /* Code to "start over" */ if (new_code == 0x100) { /* Code to "start over" */
next_code = 258; next_code = 258;
BITSFull = setBITS(START_BITS); setBITS(START_BITS);
old_code = input_code(&input); old_code = input_code(&input);
character = old_code; character = old_code;
*output++ = (char)character; *output++ = (char)character;
@ -1216,7 +1216,7 @@ static void expand(byte *input, byte *output, int fileLength)
*output++ = *string--; *output++ = *string--;
if (next_code > MAX_CODE) if (next_code > MAX_CODE)
BITSFull = setBITS(BITS + 1); setBITS(BITS + 1);
prefix_code[next_code] = old_code; prefix_code[next_code] = old_code;
append_character[next_code] = character; append_character[next_code] = character;

View File

@ -638,7 +638,6 @@ void Logic::ReadArgs(bool CommandIsIf, byte CmdNum)
string ThisMessage; string ThisMessage;
int ThisMessageNum; int ThisMessageNum;
string ThisInvObjectName; string ThisInvObjectName;
int ThisInvObjectNum;
int i; int i;
SkipSpaces(); SkipSpaces();
@ -745,7 +744,6 @@ void Logic::ReadArgs(bool CommandIsIf, byte CmdNum)
else{ else{
for(i=0;i<objlist->ItemNames.num;i++){ for(i=0;i<objlist->ItemNames.num;i++){
if(objlist->ItemNames.at(i)==ThisInvObjectName){ if(objlist->ItemNames.at(i)==ThisInvObjectName){
ThisInvObjectNum = i;
WriteByte(i); WriteByte(i);
break; break;
} }

View File

@ -908,11 +908,9 @@ void PCanvas::setPixsize(int s)
//********************************************* //*********************************************
void PCanvas::viewportMousePressEvent(QMouseEvent* event) void PCanvas::viewportMousePressEvent(QMouseEvent* event)
{ {
int x,y,xx,yy; int x,y;
viewportToContents( event->x(), event->y(), x, y ); viewportToContents( event->x(), event->y(), x, y );
xx=x;
yy=y;
x-=x0; x-=x0;
y-=y0; y-=y0;
@ -944,11 +942,9 @@ void PCanvas::viewportMousePressEvent(QMouseEvent* event)
//********************************************* //*********************************************
void PCanvas::viewportMouseMoveEvent(QMouseEvent* event) void PCanvas::viewportMouseMoveEvent(QMouseEvent* event)
{ {
int x,y,xx,yy; int x,y;
viewportToContents( event->x(), event->y(), x, y ); viewportToContents( event->x(), event->y(), x, y );
xx=x;
yy=y;
x-=x0; x-=x0;
y-=y0; y-=y0;

View File

@ -717,7 +717,6 @@ void Picture::refill( struct picCodeNode *temp_fill_start, struct picCodeNode *t
struct picCodeNode *temp,*picPos0,*temp_pic=0,*temp_pri=0; struct picCodeNode *temp,*picPos0,*temp_pic=0,*temp_pri=0;
int col_pic_orig,col_pri_orig,col_pic_new,col_pri_new; int col_pic_orig,col_pri_orig,col_pic_new,col_pri_new;
bool picDrawEnabled_orig,priDrawEnabled_orig; bool picDrawEnabled_orig,priDrawEnabled_orig;
bool picDrawEnabled_new,priDrawEnabled_new;
bool draw_pic_orig,draw_pri_orig,draw_pic_new,draw_pri_new; bool draw_pic_orig,draw_pri_orig,draw_pic_new,draw_pri_new;
picDrawEnabled_orig=priDrawEnabled_orig=false; picDrawEnabled_orig=priDrawEnabled_orig=false;
@ -833,7 +832,6 @@ void Picture::refill( struct picCodeNode *temp_fill_start, struct picCodeNode *t
temp = temp_fill_end; temp = temp_fill_end;
picDrawEnabled_new=priDrawEnabled_new=false;
col_pic_new=col_pri_new=-1; col_pic_new=col_pri_new=-1;
draw_pic_new=draw_pri_new = false; draw_pic_new=draw_pri_new = false;
if(temp){ if(temp){
@ -841,14 +839,12 @@ void Picture::refill( struct picCodeNode *temp_fill_start, struct picCodeNode *t
switch(temp->node){ switch(temp->node){
case 0xf0: case 0xf0:
col_pic_new = (temp->next)->node; col_pic_new = (temp->next)->node;
picDrawEnabled_new=true;
break; break;
case 0xf1: case 0xf1:
col_pic_new = -2; col_pic_new = -2;
break; break;
case 0xf2: case 0xf2:
col_pri_new = (temp->next)->node; col_pri_new = (temp->next)->node;
priDrawEnabled_new=true;
break; break;
case 0xf3: case 0xf3:
col_pri_new = -2; col_pri_new = -2;

View File

@ -604,7 +604,7 @@ void PreviewView::draw(int ResNum)
//***************************************** //*****************************************
void PreviewView::show_description() void PreviewView::show_description()
{ {
int x,y,w,h,W,H,n; int y,w,h,W,H,n;
unsigned int maxcol; unsigned int maxcol;
preview->description->hide(); preview->description->hide();
@ -614,7 +614,6 @@ void PreviewView::show_description()
W=preview->width(); W=preview->width();
H=preview->height(); H=preview->height();
x=this->x();
y=this->y(); y=this->y();
preview->description->setGeometry(10,y+h+10,W-20,H-(y+h+20)); preview->description->setGeometry(10,y+h+10,W-20,H-(y+h+20));

View File

@ -529,10 +529,6 @@ void ViewEdit::open(char *filename)
//********************************************* //*********************************************
void ViewEdit::DisplayView() void ViewEdit::DisplayView()
{ {
int w,h;
w = canvas->x0+canvas->cur_w*canvas->pixsize*2+10;
h = canvas->y0+canvas->cur_h*canvas->pixsize+10;
int i=view->loops[view->CurLoop].mirror; int i=view->loops[view->CurLoop].mirror;
if(i!=-1){ if(i!=-1){
canvas->DrawCel(view->loops[i].cels[view->CurCel].width,view->loops[i].cels[view->CurCel].height,view->loops[i].cels[view->CurCel].data,true); canvas->DrawCel(view->loops[i].cels[view->CurCel].width,view->loops[i].cels[view->CurCel].height,view->loops[i].cels[view->CurCel].data,true);