Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 2 files changed
  • 2 commit comments
  • 1 contributor
Showing with 11 additions and 6 deletions.
  1. +2 −2 gemrb/core/Font.cpp
  2. +9 −4 gemrb/plugins/CHUImporter/CHUImporter.cpp
View
4 gemrb/core/Font.cpp
@@ -94,10 +94,10 @@ void Font::PrintFromLine(int startrow, Region rgn, const unsigned char* string,
capital=1;
enablecap=true;
initials_rows = 1 + ((initials->maxHeight - 1) / maxHeight); // ceiling
- currCap = string[0];
+ currCap = tmp[0];
if ((startrow > 0 && initials_rows > 0) || (len > 0 && isspace(currCap))) { // we need to look back to get the cap
while(isspace(currCap) && num_empty_rows < len){//we cant cap whiteSpace so keep looking
- currCap = string[++num_empty_rows];
+ currCap = tmp[++num_empty_rows];
// WARNING: this assumes all preceeding whiteSpace is an empty line
}
last_initial_row = startrow - 1; // always the row before current since this cannot be the first row
View
13 gemrb/plugins/CHUImporter/CHUImporter.cpp
@@ -118,15 +118,20 @@ Window* CHUImporter::GetWindow(unsigned int wid)
str->Seek( CTOffset + ( ( FirstControl + i ) * 8 ), GEM_STREAM_START );
ieDword COffset, CLength, ControlID;
Region ctrlFrame;
+ ieWord tmp;
ieByte ControlType, temp;
str->ReadDword( &COffset );
str->ReadDword( &CLength );
str->Seek( COffset, GEM_STREAM_START );
str->ReadDword( &ControlID );
- str->ReadWord( (ieWord*)&ctrlFrame.x );
- str->ReadWord( (ieWord*)&ctrlFrame.y );
- str->ReadWord( (ieWord*)&ctrlFrame.w );
- str->ReadWord( (ieWord*)&ctrlFrame.h );
+ str->ReadWord( &tmp );
+ ctrlFrame.x = tmp;
+ str->ReadWord( &tmp);
+ ctrlFrame.y = tmp;
+ str->ReadWord( &tmp );
+ ctrlFrame.w = tmp;
+ str->ReadWord( &tmp );
+ ctrlFrame.h = tmp;
str->Read( &ControlType, 1 );
str->Read( &temp, 1 );
switch (ControlType) {

Showing you all comments on commits in this comparison.

@wjp
Owner

Regarding the commit message: it was not the unsigned/signed difference that was problematic, but the short/int.

@bradallred
Owner

yeah i realized that after too, i was just blindly going of what lynx said. Believe me I'm plenty embarrassed for making the mistake in the first place and now this :(

Something went wrong with that request. Please try again.