diff options
| author | D G Turner | 2019-10-03 04:56:46 +0100 |
|---|---|---|
| committer | D G Turner | 2019-10-03 04:56:46 +0100 |
| commit | 7cc908f0ac049a9be9cd425a38124c6238ad3629 (patch) | |
| tree | 312b6956352559fb0dd59a616da0565fc81d1db6 | |
| parent | e97985e88719e734619857dc101646e135d6fd42 (diff) | |
| download | scummvm-rg350-7cc908f0ac049a9be9cd425a38124c6238ad3629.tar.gz scummvm-rg350-7cc908f0ac049a9be9cd425a38124c6238ad3629.tar.bz2 scummvm-rg350-7cc908f0ac049a9be9cd425a38124c6238ad3629.zip | |
DIRECTOR: Fix MSVC Warnings
| -rw-r--r-- | engines/director/lingo/lingo-gr.cpp | 2 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-gr.y | 2 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index 744049e4dc..9f4fe49076 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -2290,7 +2290,7 @@ yyreduce: WRITE_UINT32(&finish, (yyvsp[(7) - (11)].code) - (yyvsp[(1) - (11)].code)); WRITE_UINT32(&body, (yyvsp[(9) - (11)].code) - (yyvsp[(1) - (11)].code)); WRITE_UINT32(&end, (yyvsp[(10) - (11)].code) - (yyvsp[(1) - (11)].code)); - WRITE_UINT32(&inc, -1); + WRITE_UINT32(&inc, (uint32)-1); (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 1] = init; /* initial count value */ (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 2] = finish;/* final count value */ (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 3] = body; /* body of loop */ diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y index 08af780465..974105573a 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -236,7 +236,7 @@ stmt: stmtoneliner WRITE_UINT32(&finish, $7 - $1); WRITE_UINT32(&body, $9 - $1); WRITE_UINT32(&end, $10 - $1); - WRITE_UINT32(&inc, -1); + WRITE_UINT32(&inc, (uint32)-1); (*g_lingo->_currentScript)[$1 + 1] = init; /* initial count value */ (*g_lingo->_currentScript)[$1 + 2] = finish;/* final count value */ (*g_lingo->_currentScript)[$1 + 3] = body; /* body of loop */ diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index 1f5d81d668..7b98269f2f 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -333,7 +333,7 @@ void yyfree (void * ); /* Begin user sect3 */ -#define yywrap(n) 1 +#define yywrap() 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -1648,7 +1648,7 @@ case YY_STATE_EOF(INITIAL): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap() ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1947,7 +1947,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap() ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) |